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/UI/ClassicButton.Designer.cs | 91 ------------------- Histacom2.Engine/UI/ClassicButton.cs | 77 ++++++++-------- Histacom2.Engine/UI/ClassicButton.resx | 123 -------------------------- 3 files changed, 40 insertions(+), 251 deletions(-) delete mode 100644 Histacom2.Engine/UI/ClassicButton.Designer.cs delete mode 100644 Histacom2.Engine/UI/ClassicButton.resx (limited to 'Histacom2.Engine/UI') 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 -- cgit v1.2.3 From 859e2483cbfd124d3dde85f1654df9aaa17ca605 Mon Sep 17 00:00:00 2001 From: lempamo Date: Tue, 5 Sep 2017 20:05:28 -0400 Subject: buttons and window colors --- Histacom2.Engine/Paintbrush.cs | 12 ++ Histacom2.Engine/Template/Infobox95.Designer.cs | 55 ++++---- Histacom2.Engine/Template/Infobox95.cs | 8 ++ Histacom2.Engine/Template/WinClassic.Designer.cs | 9 ++ Histacom2.Engine/Template/WinClassic.cs | 100 ++++++++++++++ Histacom2.Engine/Template/WinClassic.resx | 22 +-- Histacom2.Engine/Theme.cs | 11 ++ Histacom2.Engine/UI/ClassicButton.cs | 23 +++- .../Win95Apps/WinClassicThemePanel.Designer.cs | 18 +-- .../OS/Win95/Win95Apps/WinClassicThemePanel.cs | 4 + .../Win95/Win95Apps/WinClassicWelcome.Designer.cs | 48 +++---- Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.cs | 7 - Histacom2/OS/Win98/Win98.Designer.cs | 150 ++++++++++----------- Histacom2/OS/Win98/Win98.resx | 34 ++--- 14 files changed, 321 insertions(+), 180 deletions(-) (limited to 'Histacom2.Engine/UI') diff --git a/Histacom2.Engine/Paintbrush.cs b/Histacom2.Engine/Paintbrush.cs index 320b80d..ab84491 100644 --- a/Histacom2.Engine/Paintbrush.cs +++ b/Histacom2.Engine/Paintbrush.cs @@ -45,5 +45,17 @@ namespace Histacom2.Engine // Draw the line. e.Graphics.DrawLine(new Pen(foreColor), 4, height / 2, width - 4, height / 2); } + + public static Color GetLightFromColor(Color basecolor) + { + if (basecolor == Color.FromArgb(112, 112, 112)) return Color.FromArgb(184, 184, 184); + return ControlPaint.Light(basecolor, 50); + } + + public static Color GetDarkFromColor(Color basecolor) + { + if (basecolor == Color.FromArgb(112, 112, 112)) return Color.FromArgb(72, 72, 72); + return ControlPaint.Dark(basecolor, 50); + } } } diff --git a/Histacom2.Engine/Template/Infobox95.Designer.cs b/Histacom2.Engine/Template/Infobox95.Designer.cs index 6ee2a6a..7bb6869 100644 --- a/Histacom2.Engine/Template/Infobox95.Designer.cs +++ b/Histacom2.Engine/Template/Infobox95.Designer.cs @@ -29,11 +29,11 @@ private void InitializeComponent() { this.programContent = new System.Windows.Forms.Panel(); - 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.button1 = new Histacom2.Engine.UI.ClassicButton(); + this.button3 = new Histacom2.Engine.UI.ClassicButton(); this.button2 = new Histacom2.Engine.UI.ClassicButton(); this.programContent.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); @@ -54,31 +54,7 @@ this.programContent.Size = new System.Drawing.Size(413, 118); this.programContent.TabIndex = 10; this.programContent.Tag = "gnoreFormOnTaskbar"; - // - // button1 - // - 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 = 6; - this.button1.Text = "Yes"; - this.button1.Click += new System.EventHandler(this.button1_Click); - // - // button3 - // - 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.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.Click += new System.EventHandler(this.button3_Click); + this.programContent.Paint += new System.Windows.Forms.PaintEventHandler(this.programContent_Paint); // // pictureBox1 // @@ -108,6 +84,31 @@ this.infoText.TabIndex = 0; this.infoText.Text = "label1"; // + // button1 + // + 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 = 6; + this.button1.Text = "Yes"; + this.button1.Click += new System.EventHandler(this.button1_Click); + // + // button3 + // + 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.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.Click += new System.EventHandler(this.button3_Click); + // // button2 // this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) diff --git a/Histacom2.Engine/Template/Infobox95.cs b/Histacom2.Engine/Template/Infobox95.cs index dca45bb..9214461 100644 --- a/Histacom2.Engine/Template/Infobox95.cs +++ b/Histacom2.Engine/Template/Infobox95.cs @@ -13,6 +13,8 @@ namespace Histacom2.Engine.Template public Infobox95(InfoboxType type, InfoboxButtons btns) { InitializeComponent(); + this.BackColor = SaveSystem.currentTheme.threeDObjectsColor; + this.programContent.BackColor = SaveSystem.currentTheme.threeDObjectsColor; switch (type) { @@ -63,6 +65,12 @@ namespace Histacom2.Engine.Template { if (btnStatus == 0) this.ParentForm.Close(); } + + private void programContent_Paint(object sender, PaintEventArgs e) + { + this.BackColor = SaveSystem.currentTheme.threeDObjectsColor; + this.programContent.BackColor = SaveSystem.currentTheme.threeDObjectsColor; + } } public enum InfoboxType diff --git a/Histacom2.Engine/Template/WinClassic.Designer.cs b/Histacom2.Engine/Template/WinClassic.Designer.cs index 593cfd6..bacce99 100644 --- a/Histacom2.Engine/Template/WinClassic.Designer.cs +++ b/Histacom2.Engine/Template/WinClassic.Designer.cs @@ -79,6 +79,7 @@ this.programContent.Name = "programContent"; this.programContent.Size = new System.Drawing.Size(292, 274); this.programContent.TabIndex = 9; + this.programContent.ControlAdded += new System.Windows.Forms.ControlEventHandler(this.programContent_ControlAdded); // // programtopbar // @@ -160,6 +161,7 @@ this.toprightcorner.Name = "toprightcorner"; this.toprightcorner.Size = new System.Drawing.Size(4, 4); this.toprightcorner.TabIndex = 6; + this.toprightcorner.Paint += new System.Windows.Forms.PaintEventHandler(this.toprightcorner_Paint); this.toprightcorner.MouseDown += new System.Windows.Forms.MouseEventHandler(this.border_MouseDown); this.toprightcorner.MouseMove += new System.Windows.Forms.MouseEventHandler(this.toprightcorner_MouseMove); this.toprightcorner.MouseUp += new System.Windows.Forms.MouseEventHandler(this.border_MouseUp); @@ -173,6 +175,7 @@ this.bottomrightcorner.Name = "bottomrightcorner"; this.bottomrightcorner.Size = new System.Drawing.Size(4, 4); this.bottomrightcorner.TabIndex = 4; + this.bottomrightcorner.Paint += new System.Windows.Forms.PaintEventHandler(this.bottomrightcorner_Paint); this.bottomrightcorner.MouseDown += new System.Windows.Forms.MouseEventHandler(this.border_MouseDown); this.bottomrightcorner.MouseMove += new System.Windows.Forms.MouseEventHandler(this.bottomrightcorner_MouseMove); this.bottomrightcorner.MouseUp += new System.Windows.Forms.MouseEventHandler(this.border_MouseUp); @@ -186,6 +189,7 @@ this.bottomleftcorner.Name = "bottomleftcorner"; this.bottomleftcorner.Size = new System.Drawing.Size(4, 4); this.bottomleftcorner.TabIndex = 2; + this.bottomleftcorner.Paint += new System.Windows.Forms.PaintEventHandler(this.bottomleftcorner_Paint); this.bottomleftcorner.MouseDown += new System.Windows.Forms.MouseEventHandler(this.border_MouseDown); this.bottomleftcorner.MouseMove += new System.Windows.Forms.MouseEventHandler(this.bottomleftcorner_MouseMove); this.bottomleftcorner.MouseUp += new System.Windows.Forms.MouseEventHandler(this.border_MouseUp); @@ -198,6 +202,7 @@ this.topleftcorner.Name = "topleftcorner"; this.topleftcorner.Size = new System.Drawing.Size(4, 4); this.topleftcorner.TabIndex = 1; + this.topleftcorner.Paint += new System.Windows.Forms.PaintEventHandler(this.topleftcorner_Paint); this.topleftcorner.MouseDown += new System.Windows.Forms.MouseEventHandler(this.border_MouseDown); this.topleftcorner.MouseMove += new System.Windows.Forms.MouseEventHandler(this.topleftcorner_MouseMove); this.topleftcorner.MouseUp += new System.Windows.Forms.MouseEventHandler(this.border_MouseUp); @@ -211,6 +216,7 @@ this.left.Name = "left"; this.left.Size = new System.Drawing.Size(4, 292); this.left.TabIndex = 3; + this.left.Paint += new System.Windows.Forms.PaintEventHandler(this.left_Paint); this.left.MouseDown += new System.Windows.Forms.MouseEventHandler(this.border_MouseDown); this.left.MouseMove += new System.Windows.Forms.MouseEventHandler(this.left_MouseMove); this.left.MouseUp += new System.Windows.Forms.MouseEventHandler(this.border_MouseUp); @@ -225,6 +231,7 @@ this.bottom.Name = "bottom"; this.bottom.Size = new System.Drawing.Size(296, 4); this.bottom.TabIndex = 5; + this.bottom.Paint += new System.Windows.Forms.PaintEventHandler(this.bottom_Paint); this.bottom.MouseDown += new System.Windows.Forms.MouseEventHandler(this.border_MouseDown); this.bottom.MouseMove += new System.Windows.Forms.MouseEventHandler(this.bottom_MouseMove); this.bottom.MouseUp += new System.Windows.Forms.MouseEventHandler(this.border_MouseUp); @@ -238,6 +245,7 @@ this.right.Name = "right"; this.right.Size = new System.Drawing.Size(4, 296); this.right.TabIndex = 7; + this.right.Paint += new System.Windows.Forms.PaintEventHandler(this.right_Paint); this.right.MouseDown += new System.Windows.Forms.MouseEventHandler(this.border_MouseDown); this.right.MouseMove += new System.Windows.Forms.MouseEventHandler(this.right_MouseMove); this.right.MouseUp += new System.Windows.Forms.MouseEventHandler(this.border_MouseUp); @@ -252,6 +260,7 @@ this.top.Name = "top"; this.top.Size = new System.Drawing.Size(300, 4); this.top.TabIndex = 8; + this.top.Paint += new System.Windows.Forms.PaintEventHandler(this.top_Paint); this.top.MouseDown += new System.Windows.Forms.MouseEventHandler(this.border_MouseDown); this.top.MouseMove += new System.Windows.Forms.MouseEventHandler(this.top_MouseMove); this.top.MouseUp += new System.Windows.Forms.MouseEventHandler(this.border_MouseUp); diff --git a/Histacom2.Engine/Template/WinClassic.cs b/Histacom2.Engine/Template/WinClassic.cs index 20e66f0..c1c7fe1 100644 --- a/Histacom2.Engine/Template/WinClassic.cs +++ b/Histacom2.Engine/Template/WinClassic.cs @@ -11,6 +11,7 @@ namespace Histacom2.Engine.Template { InitializeComponent(); DoubleBuffered = true; + programContent.BackColor = SaveSystem.currentTheme.threeDObjectsColor; } public Font fnt; @@ -207,6 +208,105 @@ namespace Histacom2.Engine.Template public bool max = false; + + private void bottom_Paint(object sender, PaintEventArgs e) + { + var gfx = e.Graphics; + gfx.Clear(SaveSystem.currentTheme.threeDObjectsColor); + + var _darkBack = Paintbrush.GetDarkFromColor(SaveSystem.currentTheme.threeDObjectsColor); + + gfx.DrawLine(Pens.Black, 0, 3, bottom.Width, 3); + gfx.DrawLine(new Pen(_darkBack), 0, 2, bottom.Width, 2); + } + + private void bottomleftcorner_Paint(object sender, PaintEventArgs e) + { + var gfx = e.Graphics; + gfx.Clear(SaveSystem.currentTheme.threeDObjectsColor); + + var _lightBack = Paintbrush.GetLightFromColor(SaveSystem.currentTheme.threeDObjectsColor); + var _darkBack = Paintbrush.GetDarkFromColor(SaveSystem.currentTheme.threeDObjectsColor); + + gfx.DrawLine(Pens.Black, 0, 3, 3, 3); + gfx.DrawLine(new Pen(_darkBack), 1, 2, 3, 2); + gfx.DrawLine(new Pen(_lightBack), 1, 0, 1, 1); + } + + private void left_Paint(object sender, PaintEventArgs e) + { + var gfx = e.Graphics; + gfx.Clear(SaveSystem.currentTheme.threeDObjectsColor); + + var _lightBack = Paintbrush.GetLightFromColor(SaveSystem.currentTheme.threeDObjectsColor); + + gfx.DrawLine(new Pen(_lightBack), 1, 0, 1, left.Height); + } + + private void programContent_ControlAdded(object sender, ControlEventArgs e) + { + e.Control.BackColor = SaveSystem.currentTheme.threeDObjectsColor; + e.Control.Invalidate(); + } + + private void topleftcorner_Paint(object sender, PaintEventArgs e) + { + var gfx = e.Graphics; + gfx.Clear(SaveSystem.currentTheme.threeDObjectsColor); + + var _lightBack = Paintbrush.GetLightFromColor(SaveSystem.currentTheme.threeDObjectsColor); + + gfx.DrawLine(new Pen(_lightBack), 1, 3, 1, 1); + gfx.DrawLine(new Pen(_lightBack), 1, 1, 3, 1); + } + + private void top_Paint(object sender, PaintEventArgs e) + { + var gfx = e.Graphics; + gfx.Clear(SaveSystem.currentTheme.threeDObjectsColor); + + var _lightBack = Paintbrush.GetLightFromColor(SaveSystem.currentTheme.threeDObjectsColor); + + gfx.DrawLine(new Pen(_lightBack), 0, 1, top.Width, 1); + } + + private void toprightcorner_Paint(object sender, PaintEventArgs e) + { + var gfx = e.Graphics; + gfx.Clear(SaveSystem.currentTheme.threeDObjectsColor); + + var _lightBack = Paintbrush.GetLightFromColor(SaveSystem.currentTheme.threeDObjectsColor); + var _darkBack = Paintbrush.GetDarkFromColor(SaveSystem.currentTheme.threeDObjectsColor); + + gfx.DrawLine(new Pen(_lightBack), 0, 1, 1, 1); + gfx.DrawLine(new Pen(_darkBack), 2, 1, 2, 3); + gfx.DrawLine(Pens.Black, 3, 0, 3, 3); + } + + private void right_Paint(object sender, PaintEventArgs e) + { + var gfx = e.Graphics; + gfx.Clear(SaveSystem.currentTheme.threeDObjectsColor); + + var _darkBack = Paintbrush.GetDarkFromColor(SaveSystem.currentTheme.threeDObjectsColor); + + gfx.DrawLine(Pens.Black, 3, 0, 3, bottom.Width); + gfx.DrawLine(new Pen(_darkBack), 2, 0, 2, bottom.Width); + } + + private void bottomrightcorner_Paint(object sender, PaintEventArgs e) + { + var gfx = e.Graphics; + gfx.Clear(SaveSystem.currentTheme.threeDObjectsColor); + + var _darkBack = Paintbrush.GetDarkFromColor(SaveSystem.currentTheme.threeDObjectsColor); + + gfx.DrawLine(Pens.Black, 3, 0, 3, 3); + gfx.DrawLine(Pens.Black, 0, 3, 3, 3); + gfx.DrawLine(new Pen(_darkBack), 2, 0, 2, 2); + gfx.DrawLine(new Pen(_darkBack), 0, 2, 2, 2); + } + public Size prevSize; public Point prevPoint; private void maximizebutton_Click(object sender, EventArgs e) diff --git a/Histacom2.Engine/Template/WinClassic.resx b/Histacom2.Engine/Template/WinClassic.resx index 6876b17..a3848f8 100644 --- a/Histacom2.Engine/Template/WinClassic.resx +++ b/Histacom2.Engine/Template/WinClassic.resx @@ -121,63 +121,63 @@ iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAIAAAAmkwkpAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAdSURBVBhXYzh8 + wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAdSURBVBhXYzh8 /DQEMQDBfzBo6+oDcSDCGBwGBgAJoRsoKGRD1QAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAIAAAAmkwkpAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAdSURBVBhXYzh8 + wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAdSURBVBhXYzh8 /DQQtXX1MQABCgdIQRCIgwAMDABm/hFrLt/K7gAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAIAAAAmkwkpAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAdSURBVBhXYzh8 + wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAdSURBVBhXYzh8 /PT///+BJBBhcNq6+iCIAQEYGACcHRsocGQwIQAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAIAAAAmkwkpAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAaSURBVBhXYzh8 + wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAaSURBVBhXYzh8 /DQcgTj/YQDKQZEBcY6fBgAaSCiZEc9BxAAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAAAQAAAABCAIAAAB2XpiaAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAUSURBVBhXYzh8 + wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAUSURBVBhXYzh8 /PT///+B5OHjpwFB1wn9nx9JYgAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAAAEAAAAECAIAAADAusJtAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAVSURBVBhXYzh8 + wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAVSURBVBhXYzh8 /DQYt3X1MTAwMAAAQaQGSbsObiQAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAAAQAAAABCAIAAAB2XpiaAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAUSURBVBhXYzh8 + wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAUSURBVBhXYzh8 /DQQtXX1MTAwAAA0WgZJrWm8iAAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAAAEAAAAECAIAAADAusJtAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAVSURBVBhXYzh8 + wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAVSURBVBhXYzh8 /DTD////wfTh46cBUSgJ/bC/izUAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAIAAACpTQvdAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAA+SURBVChTY/hP + wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAA+SURBVChTY/hP CmAAAiB1nzjQ0NCA0HDgwAEQBwcAygIBNTRAJNDAqAY0DbgAdg0EAUIDkEUkAGkgDTAwAACYPGiagsMD PwAAAABJRU5ErkJggg== @@ -185,7 +185,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAIAAACpTQvdAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAA5SURBVChTY/hP + wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAA5SURBVChTY/hP CmAAAiB1nzjQ0NCA0HCACDCqASqGF2DRAOKjAog4BFBDA36A0ABkEQlAGkgDDAwAKPmlWmNluNoAAAAA SUVORK5CYII= @@ -193,7 +193,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAIAAACpTQvdAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAABcSURBVChTrY/R + wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAABcSURBVChTrY/R DcAgCERvdEbrJh2lPU+SYkINRt+PSN6J4FkBhMddw8y+wFUgCbQ70OtO7OQTJLgRa/L7JWmOt8RsB8mD TQ5NkFbeQcLwauzMdkjZCLAq0gJrAC8niIXaIK89FAAAAABJRU5ErkJggg== diff --git a/Histacom2.Engine/Theme.cs b/Histacom2.Engine/Theme.cs index 579f42e..8aa9dcf 100644 --- a/Histacom2.Engine/Theme.cs +++ b/Histacom2.Engine/Theme.cs @@ -22,6 +22,8 @@ namespace Histacom2.Engine public Color threeDObjectsColor { get; set; } public Color threeDObjectsTextColor { get; set; } + public Font buttonFont { get; set; } + public Color activeTitleBarColor { get; set; } public Color activeTitleTextColor { get; set; } public Color inactiveTitleBarColor { get; set; } @@ -48,6 +50,8 @@ namespace Histacom2.Engine threeDObjectsColor = Color.Silver; threeDObjectsTextColor = Color.Black; + buttonFont = new Font("Microsoft Sans Serif", 8.25F, FontStyle.Regular); + activeTitleBarColor = Color.Navy; activeTitleTextColor = Color.White; inactiveTitleBarColor = Color.Gray; @@ -74,6 +78,8 @@ namespace Histacom2.Engine threeDObjectsColor = Color.Silver; threeDObjectsTextColor = Color.Black; + buttonFont = new Font("Microsoft Sans Serif", 8.25F, FontStyle.Regular); + activeTitleBarColor = Color.Navy; activeTitleTextColor = Color.White; inactiveTitleBarColor = Color.Gray; @@ -97,6 +103,11 @@ namespace Histacom2.Engine progErrorSound = Properties.Resources.Win95PlusDangerousCreaturesProgError; questionSound = Properties.Resources.Win95PlusDangerousCreaturesQuestion; + threeDObjectsColor = Color.FromArgb(112, 112, 112); + threeDObjectsTextColor = Color.Black; + + buttonFont = new Font("Microsoft Sans Serif", 8.25F, FontStyle.Bold); + activeTitleBarColor = Color.Teal; activeTitleTextColor = Color.White; inactiveTitleBarColor = Color.FromArgb(72, 72, 72); diff --git a/Histacom2.Engine/UI/ClassicButton.cs b/Histacom2.Engine/UI/ClassicButton.cs index e82a742..717a6ce 100644 --- a/Histacom2.Engine/UI/ClassicButton.cs +++ b/Histacom2.Engine/UI/ClassicButton.cs @@ -10,8 +10,9 @@ namespace Histacom2.Engine.UI { public class ClassicButton : Control { - private Color _lightBack = Color.White; - private Color _darkBack = Color.Gray; + private Color _lightBack; + private Color _darkBack; + private Font _font; private bool _pressing = false; @@ -25,17 +26,31 @@ 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); + MouseDown += (s, e) => { _pressing = true; Invalidate(); }; MouseUp += (s, e) => { _pressing = false; Invalidate(); }; + Invalidate(); } protected override void OnPaint(PaintEventArgs e) { base.OnPaint(e); + + if (SaveSystem.currentTheme != null) BackColor = SaveSystem.currentTheme.threeDObjectsColor; + else BackColor = Color.Silver; + + _lightBack = Paintbrush.GetLightFromColor(BackColor); + _darkBack = Paintbrush.GetDarkFromColor(BackColor); + var g = e.Graphics; g.Clear(BackColor); g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.SingleBitPerPixelGridFit; + StringFormat sf = new StringFormat(); + sf.Alignment = StringAlignment.Center; + sf.HotkeyPrefix = System.Drawing.Text.HotkeyPrefix.Show; if (_pressing) { @@ -44,7 +59,7 @@ namespace Histacom2.Engine.UI g.FillRectangle(new SolidBrush(_darkBack), new Rectangle(1, 1, Width - 2, Height - 2)); g.FillRectangle(new SolidBrush(BackColor), new Rectangle(2, 2, Width - 3, Height - 3)); - g.DrawString(Text, Font, new SolidBrush(ForeColor), (Width / 2) - (g.MeasureString(Text, Font).Width / 2) + 1, (Height / 2) - (g.MeasureString(Text, Font).Height / 2) + 1); + g.DrawString(Text, _font, new SolidBrush(ForeColor), ((Width / 2) + 1) + Padding.Left, (Height / 2) - (g.MeasureString(Text, Font).Height / 2) + 3, sf); } else { @@ -53,7 +68,7 @@ namespace Histacom2.Engine.UI g.FillRectangle(new SolidBrush(_darkBack), new Rectangle(1, 1, Width - 2, Height - 2)); g.FillRectangle(new SolidBrush(BackColor), new Rectangle(1, 1, Width - 3, Height - 3)); - g.DrawString(Text, Font, new SolidBrush(ForeColor), (Width / 2) - (g.MeasureString(Text, Font).Width / 2), (Height / 2) - (g.MeasureString(Text, Font).Height / 2)); + g.DrawString(Text, _font, new SolidBrush(ForeColor), (Width / 2) + Padding.Left, (Height / 2) - (g.MeasureString(Text, Font).Height / 2) + 2, sf); } } diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs index ee8021c..6b92d11 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs @@ -31,9 +31,9 @@ this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.comboBox1 = new System.Windows.Forms.ComboBox(); this.pictureBox2 = new System.Windows.Forms.PictureBox(); - this.applyButton = new System.Windows.Forms.Button(); - this.cancelButton = new System.Windows.Forms.Button(); - this.okButton = new System.Windows.Forms.Button(); + this.applyButton = new Histacom2.Engine.UI.ClassicButton(); + this.cancelButton = new Histacom2.Engine.UI.ClassicButton(); + this.okButton = new Histacom2.Engine.UI.ClassicButton(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); this.SuspendLayout(); @@ -73,35 +73,29 @@ // // applyButton // - this.applyButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.applyButton.Location = new System.Drawing.Point(209, 245); this.applyButton.Name = "applyButton"; this.applyButton.Size = new System.Drawing.Size(75, 23); this.applyButton.TabIndex = 3; this.applyButton.Text = "Apply"; - this.applyButton.UseVisualStyleBackColor = true; this.applyButton.Click += new System.EventHandler(this.applyButton_Click); // // cancelButton // - this.cancelButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.cancelButton.Location = new System.Drawing.Point(128, 245); this.cancelButton.Name = "cancelButton"; this.cancelButton.Size = new System.Drawing.Size(75, 23); this.cancelButton.TabIndex = 4; this.cancelButton.Text = "Cancel"; - this.cancelButton.UseVisualStyleBackColor = true; this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click); // // okButton // - this.okButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.okButton.Location = new System.Drawing.Point(47, 245); this.okButton.Name = "okButton"; this.okButton.Size = new System.Drawing.Size(75, 23); this.okButton.TabIndex = 5; this.okButton.Text = "OK"; - this.okButton.UseVisualStyleBackColor = true; this.okButton.Click += new System.EventHandler(this.okButton_Click); // // WinClassicThemePanel @@ -129,8 +123,8 @@ private System.Windows.Forms.PictureBox pictureBox1; private System.Windows.Forms.ComboBox comboBox1; private System.Windows.Forms.PictureBox pictureBox2; - private System.Windows.Forms.Button applyButton; - private System.Windows.Forms.Button cancelButton; - private System.Windows.Forms.Button okButton; + private Histacom2.Engine.UI.ClassicButton applyButton; + private Histacom2.Engine.UI.ClassicButton cancelButton; + private Histacom2.Engine.UI.ClassicButton okButton; } } diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs index fb790cb..da354bf 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs @@ -95,6 +95,8 @@ namespace Histacom2.OS.Win95.Win95Apps ((WinClassic)f).programtopbar.BackColor = SaveSystem.currentTheme.inactiveTitleBarColor; ((WinClassic)f).Title.ForeColor = SaveSystem.currentTheme.inactiveTitleTextColor; } + f.Invalidate(); + foreach (Control c in f.Controls) c.Invalidate(); } } } @@ -136,6 +138,8 @@ namespace Histacom2.OS.Win95.Win95Apps ((WinClassic)f).programtopbar.BackColor = SaveSystem.currentTheme.inactiveTitleBarColor; ((WinClassic)f).Title.ForeColor = SaveSystem.currentTheme.inactiveTitleTextColor; } + f.Invalidate(); + foreach (Control c in f.Controls) c.Invalidate(); } } ParentForm.Close(); diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.Designer.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.Designer.cs index ca3f22d..8c1f84a 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.Designer.cs +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.Designer.cs @@ -30,10 +30,10 @@ { this.imgTip = new System.Windows.Forms.PictureBox(); this.imgPnl = new System.Windows.Forms.PictureBox(); - this.btnClose = new System.Windows.Forms.Button(); - this.btnOnline = new System.Windows.Forms.Button(); - this.btnTour = new System.Windows.Forms.Button(); this.imgWelcome = new System.Windows.Forms.PictureBox(); + this.btnClose = new Histacom2.Engine.UI.ClassicButton(); + this.btnOnline = new Histacom2.Engine.UI.ClassicButton(); + this.btnTour = new Histacom2.Engine.UI.ClassicButton(); ((System.ComponentModel.ISupportInitialize)(this.imgTip)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.imgPnl)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.imgWelcome)).BeginInit(); @@ -59,52 +59,46 @@ this.imgPnl.TabIndex = 16; this.imgPnl.TabStop = false; // + // imgWelcome + // + this.imgWelcome.BackgroundImage = global::Histacom2.Properties.Resources.win95_welcome; + this.imgWelcome.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.imgWelcome.Location = new System.Drawing.Point(19, 17); + this.imgWelcome.Name = "imgWelcome"; + this.imgWelcome.Size = new System.Drawing.Size(292, 19); + this.imgWelcome.TabIndex = 18; + this.imgWelcome.TabStop = false; + // // btnClose // this.btnClose.BackColor = System.Drawing.Color.Silver; - this.btnClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnClose.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnClose.ForeColor = System.Drawing.Color.Black; this.btnClose.Location = new System.Drawing.Point(358, 156); this.btnClose.Name = "btnClose"; this.btnClose.Size = new System.Drawing.Size(115, 26); this.btnClose.TabIndex = 15; this.btnClose.Text = "Close"; - this.btnClose.UseVisualStyleBackColor = false; this.btnClose.Click += new System.EventHandler(this.btnClose_Click); // // btnOnline // this.btnOnline.BackColor = System.Drawing.Color.Silver; - this.btnOnline.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnOnline.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnOnline.ForeColor = System.Drawing.Color.Black; this.btnOnline.Location = new System.Drawing.Point(356, 78); this.btnOnline.Name = "btnOnline"; this.btnOnline.Size = new System.Drawing.Size(115, 26); this.btnOnline.TabIndex = 14; - this.btnOnline.Text = "Online Registration"; - this.btnOnline.UseVisualStyleBackColor = false; + this.btnOnline.Text = "&Online Registration"; // // btnTour // this.btnTour.BackColor = System.Drawing.Color.Silver; - this.btnTour.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnTour.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnTour.ForeColor = System.Drawing.Color.Black; this.btnTour.Location = new System.Drawing.Point(356, 49); this.btnTour.Name = "btnTour"; this.btnTour.Size = new System.Drawing.Size(115, 26); this.btnTour.TabIndex = 12; - this.btnTour.Text = "What\'s New"; - this.btnTour.UseVisualStyleBackColor = false; - // - // imgWelcome - // - this.imgWelcome.BackgroundImage = global::Histacom2.Properties.Resources.win95_welcome; - this.imgWelcome.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.imgWelcome.Location = new System.Drawing.Point(19, 17); - this.imgWelcome.Name = "imgWelcome"; - this.imgWelcome.Size = new System.Drawing.Size(292, 19); - this.imgWelcome.TabIndex = 18; - this.imgWelcome.TabStop = false; + this.btnTour.Text = "What\'s &New"; // // WinClassicWelcome // @@ -130,9 +124,9 @@ private System.Windows.Forms.PictureBox imgTip; private System.Windows.Forms.PictureBox imgPnl; - private System.Windows.Forms.Button btnClose; - private System.Windows.Forms.Button btnOnline; - private System.Windows.Forms.Button btnTour; + private Histacom2.Engine.UI.ClassicButton btnClose; + private Histacom2.Engine.UI.ClassicButton btnOnline; + private Histacom2.Engine.UI.ClassicButton btnTour; private System.Windows.Forms.PictureBox imgWelcome; } } diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.cs index 4804ca5..6ec79a4 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.cs +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicWelcome.cs @@ -15,13 +15,6 @@ namespace Histacom2.OS.Win95.Win95Apps public WinClassicWelcome() { InitializeComponent(); - - btnTour.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); - btnTour.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); - btnOnline.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); - btnOnline.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); - btnClose.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); - btnClose.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); } private void btnClose_Click(object sender, EventArgs e) diff --git a/Histacom2/OS/Win98/Win98.Designer.cs b/Histacom2/OS/Win98/Win98.Designer.cs index 6c1f2d2..52fb2f2 100644 --- a/Histacom2/OS/Win98/Win98.Designer.cs +++ b/Histacom2/OS/Win98/Win98.Designer.cs @@ -106,9 +106,9 @@ namespace Histacom2.OS.Win98 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.deleteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.panel1.SuspendLayout(); this.taskbar.SuspendLayout(); this.clockPanel.SuspendLayout(); @@ -200,7 +200,7 @@ 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, 300); + this.startmenu.Size = new System.Drawing.Size(174, 295); this.startmenu.TabIndex = 3; // // startmenuitems @@ -217,12 +217,12 @@ namespace Histacom2.OS.Win98 this.SuspendToolStripMenuItem, this.ShutdownToolStripMenuItem}); this.startmenuitems.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.VerticalStackWithOverflow; - this.startmenuitems.Location = new System.Drawing.Point(28, 2); + this.startmenuitems.Location = new System.Drawing.Point(22, 2); this.startmenuitems.Margin = new System.Windows.Forms.Padding(0, 0, 5, 0); 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(145, 292); + this.startmenuitems.Size = new System.Drawing.Size(148, 292); this.startmenuitems.TabIndex = 0; this.startmenuitems.Text = "StartMenu"; // @@ -250,7 +250,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(138, 36); + this.ProgramsToolStripMenuItem.Size = new System.Drawing.Size(141, 36); this.ProgramsToolStripMenuItem.Text = "Programs"; // // AccessoriesToolStripMenuItem @@ -275,7 +275,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(181, 28); + this.AccessoriesToolStripMenuItem.Size = new System.Drawing.Size(186, 28); this.AccessoriesToolStripMenuItem.Text = "Accessories"; // // CommunicationsToolStripMenuItem @@ -289,7 +289,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(181, 28); + this.CommunicationsToolStripMenuItem.Size = new System.Drawing.Size(188, 28); this.CommunicationsToolStripMenuItem.Text = "Communications"; // // InternetConnectionWizardToolStripMenuItem @@ -300,7 +300,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(219, 22); + this.InternetConnectionWizardToolStripMenuItem.Size = new System.Drawing.Size(229, 22); this.InternetConnectionWizardToolStripMenuItem.Text = "Internet Connection Wizard"; this.InternetConnectionWizardToolStripMenuItem.Click += new System.EventHandler(this.temp_for_std); // @@ -312,7 +312,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(219, 22); + this.NetMeetingToolStripMenuItem.Size = new System.Drawing.Size(229, 22); this.NetMeetingToolStripMenuItem.Text = "NetMeeting"; this.NetMeetingToolStripMenuItem.Click += new System.EventHandler(this.WebChatToolStripMenuItem_Click); // @@ -329,7 +329,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(181, 28); + this.MultimediaToolStripMenuItem.Size = new System.Drawing.Size(188, 28); this.MultimediaToolStripMenuItem.Text = "Multimedia"; // // CDPlayerToolStripMenuItem @@ -340,7 +340,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(194, 22); + this.CDPlayerToolStripMenuItem.Size = new System.Drawing.Size(201, 22); this.CDPlayerToolStripMenuItem.Text = "CD Player"; // // SoundRecorderToolStripMenuItem @@ -351,7 +351,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(194, 22); + this.SoundRecorderToolStripMenuItem.Size = new System.Drawing.Size(201, 22); this.SoundRecorderToolStripMenuItem.Text = "Sound Recorder"; // // VolumeControlToolStripMenuItem @@ -362,7 +362,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(194, 22); + this.VolumeControlToolStripMenuItem.Size = new System.Drawing.Size(201, 22); this.VolumeControlToolStripMenuItem.Text = "Volume Control"; // // WindowsMediaPlayerToolStripMenuItem @@ -373,7 +373,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(194, 22); + this.WindowsMediaPlayerToolStripMenuItem.Size = new System.Drawing.Size(201, 22); this.WindowsMediaPlayerToolStripMenuItem.Text = "Windows Media Player"; // // SystemToolsToolStripMenuItem @@ -387,7 +387,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(181, 28); + this.SystemToolsToolStripMenuItem.Size = new System.Drawing.Size(188, 28); this.SystemToolsToolStripMenuItem.Text = "System Tools"; // // DiskDefragmenterToolStripMenuItem @@ -398,7 +398,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(172, 22); + this.DiskDefragmenterToolStripMenuItem.Size = new System.Drawing.Size(181, 22); this.DiskDefragmenterToolStripMenuItem.Text = "Disk Defragmenter"; // // ScanDiskToolStripMenuItem @@ -409,7 +409,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(172, 22); + this.ScanDiskToolStripMenuItem.Size = new System.Drawing.Size(181, 22); this.ScanDiskToolStripMenuItem.Text = "ScanDisk"; // // AddressBookToolStripMenuItem @@ -420,7 +420,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(181, 28); + this.AddressBookToolStripMenuItem.Size = new System.Drawing.Size(188, 28); this.AddressBookToolStripMenuItem.Text = "Address Book"; this.AddressBookToolStripMenuItem.Click += new System.EventHandler(this.AddressBookToolStripMenuItem_Click); // @@ -432,7 +432,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(181, 28); + this.CalculatorToolStripMenuItem.Size = new System.Drawing.Size(188, 28); this.CalculatorToolStripMenuItem.Text = "Calculator"; // // HyperTerminalToolStripMenuItem @@ -443,7 +443,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(181, 28); + this.HyperTerminalToolStripMenuItem.Size = new System.Drawing.Size(188, 28); this.HyperTerminalToolStripMenuItem.Text = "HyperTerminal"; // // ImagingToolStripMenuItem @@ -454,7 +454,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(181, 28); + this.ImagingToolStripMenuItem.Size = new System.Drawing.Size(188, 28); this.ImagingToolStripMenuItem.Text = "Imaging"; // // NotePadToolStripMenuItem @@ -465,7 +465,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(181, 28); + this.NotePadToolStripMenuItem.Size = new System.Drawing.Size(188, 28); this.NotePadToolStripMenuItem.Text = "Notepad"; this.NotePadToolStripMenuItem.Click += new System.EventHandler(this.NotePadToolStripMenuItem_Click); // @@ -477,7 +477,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(181, 28); + this.OnlineRegistrationToolStripMenuItem.Size = new System.Drawing.Size(188, 28); this.OnlineRegistrationToolStripMenuItem.Text = "Online Registration"; // // PaintToolStripMenuItem @@ -488,7 +488,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(181, 28); + this.PaintToolStripMenuItem.Size = new System.Drawing.Size(188, 28); this.PaintToolStripMenuItem.Text = "Paintbrush"; // // PhoneDialerToolStripMenuItem @@ -499,7 +499,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(181, 28); + this.PhoneDialerToolStripMenuItem.Size = new System.Drawing.Size(188, 28); this.PhoneDialerToolStripMenuItem.Text = "Phone Dialer"; // // WordPadToolStripMenuItem @@ -510,7 +510,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(181, 28); + this.WordPadToolStripMenuItem.Size = new System.Drawing.Size(188, 28); this.WordPadToolStripMenuItem.Text = "WordPad"; this.WordPadToolStripMenuItem.Click += new System.EventHandler(this.WordPadToolStripMenuItem_Click); // @@ -528,7 +528,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(181, 28); + this.StartUpToolStripMenuItem.Size = new System.Drawing.Size(186, 28); this.StartUpToolStripMenuItem.Text = "Online Services"; // // AOLInternetFREETrialToolStripMenuItem @@ -538,7 +538,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(241, 22); + this.AOLInternetFREETrialToolStripMenuItem.Size = new System.Drawing.Size(248, 22); this.AOLInternetFREETrialToolStripMenuItem.Text = "AOL & Internet FREE Trial!"; // // ATTWorldNetSignupToolStripMenuItem @@ -548,7 +548,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(241, 22); + this.ATTWorldNetSignupToolStripMenuItem.Size = new System.Drawing.Size(248, 22); this.ATTWorldNetSignupToolStripMenuItem.Text = "AT&T WorldNet Signup"; // // SetupCompuServe30ToolStripMenuItem @@ -558,7 +558,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(241, 22); + this.SetupCompuServe30ToolStripMenuItem.Size = new System.Drawing.Size(248, 22); this.SetupCompuServe30ToolStripMenuItem.Text = "Setup CompuServe 3.0"; // // SetupWOWFromCompuServeToolStripMenuItem @@ -567,7 +567,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(241, 22); + this.SetupWOWFromCompuServeToolStripMenuItem.Size = new System.Drawing.Size(248, 22); this.SetupWOWFromCompuServeToolStripMenuItem.Text = "Setup WOW! from CompuServe"; // // MSDOSPromptToolStripMenuItem @@ -581,7 +581,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(181, 28); + this.MSDOSPromptToolStripMenuItem.Size = new System.Drawing.Size(186, 28); this.MSDOSPromptToolStripMenuItem.Text = "StartUp"; // // EmptyToolStripMenuItem @@ -590,7 +590,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(116, 22); + this.EmptyToolStripMenuItem.Size = new System.Drawing.Size(118, 22); this.EmptyToolStripMenuItem.Text = "(Empty)"; // // InternetExplorerToolStripMenuItem @@ -602,7 +602,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(181, 28); + this.InternetExplorerToolStripMenuItem.Size = new System.Drawing.Size(186, 28); this.InternetExplorerToolStripMenuItem.Text = "Internet Explorer"; this.InternetExplorerToolStripMenuItem.Click += new System.EventHandler(this.InternetExplorerToolStripMenuItem_Click); // @@ -615,7 +615,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(181, 28); + this.MSDOSPromptToolStripMenuItem1.Size = new System.Drawing.Size(186, 28); this.MSDOSPromptToolStripMenuItem1.Text = "MS-DOS Prompt"; this.MSDOSPromptToolStripMenuItem1.Click += new System.EventHandler(this.MSDOSPromptToolStripMenuItem1_Click); // @@ -628,7 +628,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(181, 28); + this.OutlookExpressToolStripMenuItem.Size = new System.Drawing.Size(186, 28); this.OutlookExpressToolStripMenuItem.Text = "Outlook Express"; // // WindowsExplorerToolStripMenuItem1 @@ -640,7 +640,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(181, 28); + this.WindowsExplorerToolStripMenuItem1.Size = new System.Drawing.Size(186, 28); this.WindowsExplorerToolStripMenuItem1.Text = "Windows Explorer"; this.WindowsExplorerToolStripMenuItem1.Click += new System.EventHandler(this.WindowsExplorerToolStripMenuItem1_Click); // @@ -650,7 +650,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(181, 28); + this.GuessTheNumberToolStripMenuItem.Size = new System.Drawing.Size(186, 28); this.GuessTheNumberToolStripMenuItem.Text = "Guess The Number"; this.GuessTheNumberToolStripMenuItem.Visible = false; // @@ -660,7 +660,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(181, 28); + this.StartRunnerToolStripMenuItem.Size = new System.Drawing.Size(186, 28); this.StartRunnerToolStripMenuItem.Text = "Start Runner"; this.StartRunnerToolStripMenuItem.Visible = false; // @@ -670,7 +670,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(181, 28); + this.ErrorBlasterToolStripMenuItem.Size = new System.Drawing.Size(186, 28); this.ErrorBlasterToolStripMenuItem.Text = "Error Blaster"; this.ErrorBlasterToolStripMenuItem.Visible = false; // @@ -680,7 +680,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(181, 28); + this.SkindowsToolStripMenuItem.Size = new System.Drawing.Size(186, 28); this.SkindowsToolStripMenuItem.Text = "Skindows 95"; this.SkindowsToolStripMenuItem.Visible = false; // @@ -690,7 +690,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(181, 28); + this.WebChatToolStripMenuItem.Size = new System.Drawing.Size(186, 28); this.WebChatToolStripMenuItem.Text = "Web Chat"; this.WebChatToolStripMenuItem.Visible = false; // @@ -700,7 +700,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(181, 28); + this.TimeDistorterToolStripMenuItem.Size = new System.Drawing.Size(186, 28); this.TimeDistorterToolStripMenuItem.Text = "Time Distorter"; this.TimeDistorterToolStripMenuItem.Visible = false; // @@ -717,7 +717,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(138, 36); + this.DocumentsToolStripMenuItem.Size = new System.Drawing.Size(141, 36); this.DocumentsToolStripMenuItem.Text = "Documents"; // // downloaderTestToolStripMenuItem @@ -725,7 +725,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(159, 22); + this.downloaderTestToolStripMenuItem.Size = new System.Drawing.Size(165, 22); this.downloaderTestToolStripMenuItem.Text = "DownloaderTest"; this.downloaderTestToolStripMenuItem.Click += new System.EventHandler(this.downloaderTestToolStripMenuItem_Click); // @@ -734,7 +734,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(159, 22); + this.installerTestToolStripMenuItem.Size = new System.Drawing.Size(165, 22); this.installerTestToolStripMenuItem.Text = "InstallerTest"; this.installerTestToolStripMenuItem.Click += new System.EventHandler(this.installerTestToolStripMenuItem_Click); // @@ -742,7 +742,7 @@ namespace Histacom2.OS.Win98 // this.storyTest1ToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.storyTest1ToolStripMenuItem.Name = "storyTest1ToolStripMenuItem"; - this.storyTest1ToolStripMenuItem.Size = new System.Drawing.Size(159, 22); + this.storyTest1ToolStripMenuItem.Size = new System.Drawing.Size(165, 22); this.storyTest1ToolStripMenuItem.Text = "StoryTest1"; this.storyTest1ToolStripMenuItem.Click += new System.EventHandler(this.storyTest1ToolStripMenuItem_Click); // @@ -758,7 +758,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(138, 36); + this.SettingsToolStripMenuItem.Size = new System.Drawing.Size(141, 36); this.SettingsToolStripMenuItem.Text = "Settings"; // // ControlPanelToolStripMenuItem @@ -767,7 +767,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(146, 22); + this.ControlPanelToolStripMenuItem.Size = new System.Drawing.Size(151, 22); this.ControlPanelToolStripMenuItem.Text = "Control Panel"; // // PrintersToolStripMenuItem @@ -776,7 +776,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(146, 22); + this.PrintersToolStripMenuItem.Size = new System.Drawing.Size(151, 22); this.PrintersToolStripMenuItem.Text = "Printers"; // // TaskbarToolStripMenuItem @@ -785,7 +785,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(146, 22); + this.TaskbarToolStripMenuItem.Size = new System.Drawing.Size(151, 22); this.TaskbarToolStripMenuItem.Text = "Taskbar"; // // FindToolStripMenuItem @@ -803,7 +803,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(138, 36); + this.FindToolStripMenuItem.Size = new System.Drawing.Size(141, 36); this.FindToolStripMenuItem.Text = "Find"; // // FilesOrFoldersToolStripMenuItem @@ -812,7 +812,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(163, 22); + this.FilesOrFoldersToolStripMenuItem.Size = new System.Drawing.Size(169, 22); this.FilesOrFoldersToolStripMenuItem.Text = "Files or Folders..."; // // ComputerToolStripMenuItem @@ -821,7 +821,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(163, 22); + this.ComputerToolStripMenuItem.Size = new System.Drawing.Size(169, 22); this.ComputerToolStripMenuItem.Text = "Computer..."; // // OnTheInternetToolStripMenuItem @@ -830,7 +830,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(163, 22); + this.OnTheInternetToolStripMenuItem.Size = new System.Drawing.Size(169, 22); this.OnTheInternetToolStripMenuItem.Text = "On the Internet..."; // // PeopleToolStripMenuItem @@ -839,7 +839,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(163, 22); + this.PeopleToolStripMenuItem.Size = new System.Drawing.Size(169, 22); this.PeopleToolStripMenuItem.Text = "People..."; // // HelpToolStripMenuItem @@ -851,7 +851,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(138, 36); + this.HelpToolStripMenuItem.Size = new System.Drawing.Size(141, 36); this.HelpToolStripMenuItem.Text = "Help"; // // RunToolStripMenuItem @@ -863,7 +863,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(138, 36); + this.RunToolStripMenuItem.Size = new System.Drawing.Size(141, 36); this.RunToolStripMenuItem.Text = "Run..."; // // SuspendToolStripMenuItem @@ -874,7 +874,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(138, 36); + this.SuspendToolStripMenuItem.Size = new System.Drawing.Size(141, 36); this.SuspendToolStripMenuItem.Text = "Suspend"; // // ShutdownToolStripMenuItem @@ -885,7 +885,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(138, 36); + this.ShutdownToolStripMenuItem.Size = new System.Drawing.Size(141, 36); this.ShutdownToolStripMenuItem.Text = "Shut Down..."; this.ShutdownToolStripMenuItem.Click += new System.EventHandler(this.ShutdownToolStripMenuItem_Click); // @@ -894,7 +894,7 @@ namespace Histacom2.OS.Win98 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(22, 297); + this.ossidestartmenu.Size = new System.Drawing.Size(21, 297); this.ossidestartmenu.TabIndex = 4; // // osimage @@ -903,7 +903,7 @@ namespace Histacom2.OS.Win98 this.osimage.Image = global::Histacom2.Properties.Resources.Win98SideBar; this.osimage.Location = new System.Drawing.Point(0, 0); this.osimage.Name = "osimage"; - this.osimage.Size = new System.Drawing.Size(22, 297); + this.osimage.Size = new System.Drawing.Size(21, 297); this.osimage.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.osimage.TabIndex = 0; this.osimage.TabStop = false; @@ -954,7 +954,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(153, 92); + this.rightclickbackproperties.Size = new System.Drawing.Size(135, 70); // // NewToolStripMenuItem1 // @@ -963,14 +963,14 @@ namespace Histacom2.OS.Win98 this.FolderToolStripMenuItem, this.TextDocumentToolStripMenuItem}); this.NewToolStripMenuItem1.Name = "NewToolStripMenuItem1"; - this.NewToolStripMenuItem1.Size = new System.Drawing.Size(152, 22); + 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(154, 22); + this.FolderToolStripMenuItem.Size = new System.Drawing.Size(161, 22); this.FolderToolStripMenuItem.Text = "Folder"; this.FolderToolStripMenuItem.Click += new System.EventHandler(this.FolderToolStripMenuItem_Click); // @@ -978,15 +978,23 @@ namespace Histacom2.OS.Win98 // this.TextDocumentToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.TextDocumentToolStripMenuItem.Name = "TextDocumentToolStripMenuItem"; - this.TextDocumentToolStripMenuItem.Size = new System.Drawing.Size(154, 22); + 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(152, 22); + this.PropertiesToolStripMenuItem1.Size = new System.Drawing.Size(134, 22); this.PropertiesToolStripMenuItem1.Text = "Properties"; // // desktopupdate @@ -995,14 +1003,6 @@ namespace Histacom2.OS.Win98 this.desktopupdate.Interval = 5000; this.desktopupdate.Tick += new System.EventHandler(this.desktopupdate_Tick); // - // deleteToolStripMenuItem - // - this.deleteToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.deleteToolStripMenuItem.Name = "deleteToolStripMenuItem"; - this.deleteToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.deleteToolStripMenuItem.Text = "Delete"; - this.deleteToolStripMenuItem.Click += new System.EventHandler(this.deleteToolStripMenuItem_Click); - // // Windows98 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/Histacom2/OS/Win98/Win98.resx b/Histacom2/OS/Win98/Win98.resx index f1a458f..d94fb94 100644 --- a/Histacom2/OS/Win98/Win98.resx +++ b/Histacom2/OS/Win98/Win98.resx @@ -124,7 +124,7 @@ iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= @@ -195,7 +195,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACmSURBVDhPnZFR + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACmSURBVDhPnZFR EsQgCEM9ukfzZl0CREmrO7uNw0ghL360ndR7v7L9X4BfBxDeVVrOmsaLQqd1DKowK7QmYwxvza4hC66H UpiV6IJlm+UQOnvxvg7aBAPkIWpY87rICtpkX/4SX5MgmkvnxzD4JIC3BCUGzZCEfWb9I4D3M2gDp3xY oXsQ9vRAYAJVbYNqAARf2M+aQa3Hr2QAdmH5TTPoDVz1BW7tA7ajvYP7sMmIAAAAAElFTkSuQmCC @@ -238,7 +238,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACzSURBVDhPhZJR + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACzSURBVDhPhZJR EsUgCAN7dI7mzawRl1KLU2fygMimfryr9/6rcUY53FVmluDWmpoxFveViQSZuU4h72GMyMwm5AF2DPnA QPTM9FIOCTiMBarSI1712qeZwwbkkApejBuqLLK8h7Cb5T8HGI8QBLPq8+wdzr722FUNL7+gEsuE06MI qELk6T7DOhNcwTNAcuMJAZYAdQgiJAIk/kAZdr8OmCHD+5UWeRkBfKgEduUAYL/r1w0ie5EGNPvMCQAA @@ -276,7 +276,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAJVJREFUOE+VkQsSxCAMQj16bu4GFU3YdO2+Gaqi0F/7j96zfqKHqYiuByYBFfYJ + wgAADsIBFShKgAAAAJVJREFUOE+VkQsSxCAMQj16bu4GFU3YdO2+Gaqi0F/7j96zfqKHqYiuByYBFfYJ 1okT9uuef4slmG9gWjdzN4Wnf9bRT1RhaCN+KriGieyvkjr8Rl7AMMbywE0zCBiIBS9Awbn7tUD29xME Q0rM8IHhPbziKRhMU0pqjVIfcgHAfB2oiugnuEnG/EkZ/4fLZEksutHaB6sGQO/gf7MbAAAAAElFTkSu QmCC @@ -285,7 +285,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAALtJREFUOE91TwESBCEI6un9vBPRYqljhtEIyUZhzTkXKo8J1ZI4P3xjlAjsqpoN + wgAADsIBFShKgAAAALtJREFUOE91TwESBCEI6un9vBPRYqljhtEIyUZhzTkXKo8J1ZI4P3xjlAjsqpoN upcBf0zA6+7r8QAxA9170IEPm6l7PWu9A1CLwNaVpSfWNEKLWCECDnkvAdFtMgBDLeHFaNaXEpQu22B9 NsFA96i2yQlo00wejQG9VfuSCQ0IXAFAVAb468AVwJB3AHpsBFKn2uYkemh9hllezf4KcDKwtqkBpX5j Dyj5DRIeDDh3wD3c5AYkh2QwOMYPtAJqglssjE8AAAAASUVORK5CYII= @@ -294,7 +294,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAJVJREFUOE+VkIESgCAIQ/10/pwasJrlkb27nUZsoqPHPbWNlYHCN9gKMTc7O31I + wgAADsIBFShKgAAAAJVJREFUOE+VkIESgCAIQ/10/pwasJrlkb27nUZsoqPHPbWNlYHCN9gKMTc7O31I gIa0PM2EE32ErE9WNQEw1y6azbZGvkFAhnBcKMmwrQnCVI0MofA+a6UniIDYqKTx7JhBDeVaQd5fVT9m M4JvowbwzjNlu4C5DVBgVyll4Zo8AzrK0gfo6ZBSFq7J6g0+ePWj8EPDD0i7RXV30HOWAAAAAElFTkSu QmCC @@ -303,7 +303,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAJJJREFUOE+tkYEOgCAIRP10/tzk4FISZ7ZuuzDwnq4KJSL1aR/txc21llBfQVbh + wgAADsIBFShKgAAAAJJJREFUOE+tkYEOgCAIRP10/tzk4FISZ7ZuuzDwnq4KJSL1aR/txc21llBfQVbh EZJZZ5C+nEoEcIN0QDyxLVGzm6WAsMYTvRSSAqaw2jRBloApbJUBhLVub4ABqwMY1poCuEYzhPWjRkgK 6EP7A+obqOc2EzIBeELmtqNFDECI9R3gYmPhCPH+qX6HfAJAQ7iUCwlxft5LSoDNAAAAAElFTkSuQmCC @@ -311,63 +311,63 @@ iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= @@ -382,7 +382,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADq - ggAAAk1TRnQBSQFMAgEBDAEAAZABAQGQAQEBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA + ggAAAk1TRnQBSQFMAgEBDAEAAZgBAQGYAQEBIAEAASABAAT/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/ -- cgit v1.2.3 From 584789ed8a37027db496d6c90873186fe461f021 Mon Sep 17 00:00:00 2001 From: lempamo Date: Wed, 6 Sep 2017 00:26:22 -0400 Subject: a little modification --- Histacom2.Engine/UI/ClassicButton.cs | 4 +-- .../Win95Apps/WinClassicFTPClient.Designer.cs | 34 +++++++++++----------- .../OS/Win95/Win95Apps/WinClassicFTPClient.cs | 12 ++++---- .../OS/Win95/Win95Apps/WinClassicFTPClient.resx | 2 +- 4 files changed, 26 insertions(+), 26 deletions(-) (limited to 'Histacom2.Engine/UI') diff --git a/Histacom2.Engine/UI/ClassicButton.cs b/Histacom2.Engine/UI/ClassicButton.cs index 717a6ce..b761504 100644 --- a/Histacom2.Engine/UI/ClassicButton.cs +++ b/Histacom2.Engine/UI/ClassicButton.cs @@ -59,7 +59,7 @@ namespace Histacom2.Engine.UI g.FillRectangle(new SolidBrush(_darkBack), new Rectangle(1, 1, Width - 2, Height - 2)); g.FillRectangle(new SolidBrush(BackColor), new Rectangle(2, 2, Width - 3, Height - 3)); - g.DrawString(Text, _font, new SolidBrush(ForeColor), ((Width / 2) + 1) + Padding.Left, (Height / 2) - (g.MeasureString(Text, Font).Height / 2) + 3, sf); + g.DrawString(Text, _font, new SolidBrush(ForeColor), ((Width / 2) + 1) + Padding.Left, (Height / 2) - (g.MeasureString(Text, Font).Height / 2) + 2, sf); } else { @@ -68,7 +68,7 @@ namespace Histacom2.Engine.UI g.FillRectangle(new SolidBrush(_darkBack), new Rectangle(1, 1, Width - 2, Height - 2)); g.FillRectangle(new SolidBrush(BackColor), new Rectangle(1, 1, Width - 3, Height - 3)); - g.DrawString(Text, _font, new SolidBrush(ForeColor), (Width / 2) + Padding.Left, (Height / 2) - (g.MeasureString(Text, Font).Height / 2) + 2, sf); + g.DrawString(Text, _font, new SolidBrush(ForeColor), (Width / 2) + Padding.Left, (Height / 2) - (g.MeasureString(Text, Font).Height / 2) + 1, sf); } } diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs index b793250..63e056b 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs @@ -37,6 +37,7 @@ "???.html"}, 1, System.Drawing.Color.Black, System.Drawing.Color.Empty, null); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WinClassicFTPClient)); this.topBar = new System.Windows.Forms.Panel(); + this.btnLogin = new Histacom2.Engine.UI.ClassicButton(); this.infoLabel = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); this.textBox4 = new System.Windows.Forms.TextBox(); @@ -48,11 +49,10 @@ this.hostnameBox = new System.Windows.Forms.TextBox(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.panel1 = new System.Windows.Forms.Panel(); - this.btnCancel = new System.Windows.Forms.Button(); + this.btnCancel = new Histacom2.Engine.UI.ClassicButton(); this.welcomeLabel = new System.Windows.Forms.Label(); this.ftpFiles = new System.Windows.Forms.ListView(); this.fileIcons = new System.Windows.Forms.ImageList(this.components); - this.btnLogin = new Histacom2.Engine.UI.ClassicButton(); this.topBar.SuspendLayout(); this.panel1.SuspendLayout(); this.SuspendLayout(); @@ -76,6 +76,18 @@ this.topBar.Size = new System.Drawing.Size(762, 30); this.topBar.TabIndex = 0; // + // btnLogin + // + this.btnLogin.BackColor = System.Drawing.Color.Silver; + this.btnLogin.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnLogin.ForeColor = System.Drawing.Color.Black; + this.btnLogin.Location = new System.Drawing.Point(585, 4); + this.btnLogin.Name = "btnLogin"; + this.btnLogin.Size = new System.Drawing.Size(44, 20); + this.btnLogin.TabIndex = 9; + this.btnLogin.Text = "Login"; + this.btnLogin.Click += new System.EventHandler(this.button1_Click); + // // infoLabel // this.infoLabel.AutoSize = true; @@ -172,13 +184,13 @@ // // btnCancel // - this.btnCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnCancel.BackColor = System.Drawing.Color.Silver; + this.btnCancel.ForeColor = System.Drawing.Color.Black; this.btnCancel.Location = new System.Drawing.Point(3, 2); this.btnCancel.Name = "btnCancel"; this.btnCancel.Size = new System.Drawing.Size(75, 23); this.btnCancel.TabIndex = 0; this.btnCancel.Text = "Cancel"; - this.btnCancel.UseVisualStyleBackColor = true; this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); // // welcomeLabel @@ -225,18 +237,6 @@ this.fileIcons.Images.SetKeyName(1, "WinClassicNotepad.png"); this.fileIcons.Images.SetKeyName(2, "WinClassicSetup.png"); // - // btnLogin - // - this.btnLogin.BackColor = System.Drawing.Color.Silver; - this.btnLogin.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnLogin.ForeColor = System.Drawing.Color.Black; - this.btnLogin.Location = new System.Drawing.Point(585, 4); - this.btnLogin.Name = "btnLogin"; - this.btnLogin.Size = new System.Drawing.Size(44, 20); - this.btnLogin.TabIndex = 9; - this.btnLogin.Text = "Login"; - this.btnLogin.Click += new System.EventHandler(this.button1_Click); - // // WinClassicFTPClient // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -268,7 +268,7 @@ public System.Windows.Forms.TextBox hostnameBox; private System.Windows.Forms.Label infoLabel; private System.Windows.Forms.Panel panel1; - private System.Windows.Forms.Button btnCancel; + private Engine.UI.ClassicButton btnCancel; private System.Windows.Forms.Label welcomeLabel; internal System.Windows.Forms.ListView ftpFiles; private System.Windows.Forms.ImageList fileIcons; diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs index 2fd4afd..4dd74fb 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs @@ -117,11 +117,6 @@ namespace Histacom2.OS.Win95.Win95Apps } } - private void DoClassicButtons() - { - btnCancel.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); - } - private void btnCancel_Click(object sender, EventArgs e) { ParentForm.Close(); @@ -129,7 +124,12 @@ namespace Histacom2.OS.Win95.Win95Apps private void WinClassicFTPClient_Load(object sender, EventArgs e) { - DoClassicButtons(); + + } + + private void topBar_Paint(object sender, PaintEventArgs e) + { + topBar.BackColor = SaveSystem.currentTheme.threeDObjectsColor; } } } diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.resx b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.resx index 607312e..9dd3ac3 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.resx +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.resx @@ -128,7 +128,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABe - EgAAAk1TRnQBSQFMAgEBAwEAASgBAAEoAQABIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + EgAAAk1TRnQBSQFMAgEBAwEAATABAAEwAQABIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABgAMAASADAAEBAQABCAYAARAYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA -- cgit v1.2.3 From 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/UI') 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 c11ba68e8f319acc62b72259235a04b12892bffa Mon Sep 17 00:00:00 2001 From: lempamo Date: Sat, 9 Sep 2017 19:16:44 -0400 Subject: finished the look of the textbox, but it doesnt work --- Histacom2.Engine/UI/ClassicTextbox.cs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'Histacom2.Engine/UI') diff --git a/Histacom2.Engine/UI/ClassicTextbox.cs b/Histacom2.Engine/UI/ClassicTextbox.cs index efe85a4..e38af16 100644 --- a/Histacom2.Engine/UI/ClassicTextbox.cs +++ b/Histacom2.Engine/UI/ClassicTextbox.cs @@ -10,9 +10,12 @@ namespace Histacom2.Engine.UI { public class ClassicTextbox : Control { + public bool UseSystemPasswordChar { get; set; } + public ClassicTextbox() : base() { - + if (SaveSystem.currentTheme != null) Font = SaveSystem.currentTheme.buttonFont; + else Font = new Font("Microsoft Sans Serif", 8.25F, FontStyle.Regular); } protected override void OnPaint(PaintEventArgs e) @@ -28,9 +31,16 @@ namespace Histacom2.Engine.UI var _lightBack = Paintbrush.GetLightFromColor(textboxcolor); var _darkBack = Paintbrush.GetDarkFromColor(textboxcolor); + if (SaveSystem.currentTheme != null) Font = SaveSystem.currentTheme.buttonFont; + else Font = new Font("Microsoft Sans Serif", 8.25F, FontStyle.Regular); + var g = e.Graphics; g.Clear(BackColor); + g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.SingleBitPerPixelGridFit; + if (UseSystemPasswordChar) g.DrawString(new string('●', Text.Length), Font, Brushes.Black, 3, 3); + else g.DrawString(Text, Font, Brushes.Black, 3, 3); + 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); -- 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/UI') 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/UI') 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 868078d5cb4edafda5a01f116391d927ceeedf9d Mon Sep 17 00:00:00 2001 From: lempamo Date: Wed, 13 Sep 2017 12:55:01 -0400 Subject: colored taskbar things and new buttons in calc --- Histacom2.Engine/UI/ClassicButton.cs | 18 ++ .../WinClassicCalculator.Designer.cs | 219 ++++++++++----------- Histacom2/OS/Win95/Win95.cs | 31 +-- .../OS/Win95/Win95Apps/WinClassicThemePanel.cs | 3 - Histacom2/OS/Win95/Win95TaskBarItem.Designer.cs | 1 + Histacom2/OS/Win95/Win95TaskBarItem.cs | 17 ++ 6 files changed, 147 insertions(+), 142 deletions(-) (limited to 'Histacom2.Engine/UI') diff --git a/Histacom2.Engine/UI/ClassicButton.cs b/Histacom2.Engine/UI/ClassicButton.cs index 1a77964..26dbd26 100644 --- a/Histacom2.Engine/UI/ClassicButton.cs +++ b/Histacom2.Engine/UI/ClassicButton.cs @@ -28,8 +28,14 @@ namespace Histacom2.Engine.UI } } + public bool AdaptForeColorWithTheme { get; set; } + public bool AdaptFontWithTheme { get; set; } + public ClassicButton() : base() { + AdaptForeColorWithTheme = true; + AdaptFontWithTheme = true; + if (SaveSystem.currentTheme != null) BackColor = SaveSystem.currentTheme.threeDObjectsColor; else BackColor = Color.Silver; _lightBack = ControlPaint.Light(BackColor, 50); @@ -53,6 +59,18 @@ namespace Histacom2.Engine.UI if (SaveSystem.currentTheme != null) BackColor = SaveSystem.currentTheme.threeDObjectsColor; else BackColor = Color.Silver; + if (AdaptForeColorWithTheme) + { + if (SaveSystem.currentTheme != null) ForeColor = SaveSystem.currentTheme.threeDObjectsTextColor; + else ForeColor = Color.Black; + } + + if (AdaptFontWithTheme) + { + if (SaveSystem.currentTheme != null) Font = SaveSystem.currentTheme.buttonFont; + else Font = new Font("Microsoft Sans Serif", 8.25F, FontStyle.Regular); + } + _lightBack = Paintbrush.GetLightFromColor(BackColor); _darkBack = Paintbrush.GetDarkFromColor(BackColor); diff --git a/Histacom2/GlobalPrograms/WinClassicCalculator.Designer.cs b/Histacom2/GlobalPrograms/WinClassicCalculator.Designer.cs index 6f03978..80c3e93 100644 --- a/Histacom2/GlobalPrograms/WinClassicCalculator.Designer.cs +++ b/Histacom2/GlobalPrograms/WinClassicCalculator.Designer.cs @@ -39,33 +39,33 @@ this.CopyCtrlCToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.EditToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.txtNumbers = new System.Windows.Forms.TextBox(); - this.Button27 = new System.Windows.Forms.Button(); - this.Button26 = new System.Windows.Forms.Button(); - this.Button1 = new System.Windows.Forms.Button(); - this.Button25 = new System.Windows.Forms.Button(); - this.Button2 = new System.Windows.Forms.Button(); - this.Button21 = new System.Windows.Forms.Button(); - this.Button3 = new System.Windows.Forms.Button(); - this.Button22 = new System.Windows.Forms.Button(); - this.Button4 = new System.Windows.Forms.Button(); - this.Button23 = new System.Windows.Forms.Button(); - this.Button11 = new System.Windows.Forms.Button(); - this.Button7 = new System.Windows.Forms.Button(); - this.Button16 = new System.Windows.Forms.Button(); - this.Button24 = new System.Windows.Forms.Button(); - this.Button12 = new System.Windows.Forms.Button(); - this.one = new System.Windows.Forms.Button(); - this.Button15 = new System.Windows.Forms.Button(); - this.Button17 = new System.Windows.Forms.Button(); - this.Button13 = new System.Windows.Forms.Button(); - this.Button5 = new System.Windows.Forms.Button(); - this.Button14 = new System.Windows.Forms.Button(); - this.Button18 = new System.Windows.Forms.Button(); - this.Button8 = new System.Windows.Forms.Button(); - this.Button10 = new System.Windows.Forms.Button(); - this.Button20 = new System.Windows.Forms.Button(); - this.Button19 = new System.Windows.Forms.Button(); - this.Button9 = new System.Windows.Forms.Button(); + this.Button27 = new Histacom2.Engine.UI.ClassicButton(); + this.Button26 = new Histacom2.Engine.UI.ClassicButton(); + this.Button1 = new Histacom2.Engine.UI.ClassicButton(); + this.Button25 = new Histacom2.Engine.UI.ClassicButton(); + this.Button2 = new Histacom2.Engine.UI.ClassicButton(); + this.Button21 = new Histacom2.Engine.UI.ClassicButton(); + this.Button3 = new Histacom2.Engine.UI.ClassicButton(); + this.Button22 = new Histacom2.Engine.UI.ClassicButton(); + this.Button4 = new Histacom2.Engine.UI.ClassicButton(); + this.Button23 = new Histacom2.Engine.UI.ClassicButton(); + this.Button11 = new Histacom2.Engine.UI.ClassicButton(); + this.Button7 = new Histacom2.Engine.UI.ClassicButton(); + this.Button16 = new Histacom2.Engine.UI.ClassicButton(); + this.Button24 = new Histacom2.Engine.UI.ClassicButton(); + this.Button12 = new Histacom2.Engine.UI.ClassicButton(); + this.one = new Histacom2.Engine.UI.ClassicButton(); + this.Button15 = new Histacom2.Engine.UI.ClassicButton(); + this.Button17 = new Histacom2.Engine.UI.ClassicButton(); + this.Button13 = new Histacom2.Engine.UI.ClassicButton(); + this.Button5 = new Histacom2.Engine.UI.ClassicButton(); + this.Button14 = new Histacom2.Engine.UI.ClassicButton(); + this.Button18 = new Histacom2.Engine.UI.ClassicButton(); + this.Button8 = new Histacom2.Engine.UI.ClassicButton(); + this.Button10 = new Histacom2.Engine.UI.ClassicButton(); + this.Button20 = new Histacom2.Engine.UI.ClassicButton(); + this.Button19 = new Histacom2.Engine.UI.ClassicButton(); + this.Button9 = new Histacom2.Engine.UI.ClassicButton(); this.MenuStrip2 = new System.Windows.Forms.MenuStrip(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.MenuStrip2.SuspendLayout(); @@ -159,8 +159,9 @@ // // Button27 // + this.Button27.AdaptFontWithTheme = false; + this.Button27.AdaptForeColorWithTheme = false; this.Button27.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.Button27.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button27.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button27.ForeColor = System.Drawing.Color.Firebrick; this.Button27.Location = new System.Drawing.Point(159, 71); @@ -168,13 +169,13 @@ this.Button27.Size = new System.Drawing.Size(49, 28); this.Button27.TabIndex = 84; this.Button27.Text = "CE"; - this.Button27.UseVisualStyleBackColor = true; this.Button27.Click += new System.EventHandler(this.Button27_Click); // // Button26 // + this.Button26.AdaptFontWithTheme = false; + this.Button26.AdaptForeColorWithTheme = false; this.Button26.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.Button26.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button26.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button26.ForeColor = System.Drawing.Color.Firebrick; this.Button26.Location = new System.Drawing.Point(210, 71); @@ -182,13 +183,13 @@ this.Button26.Size = new System.Drawing.Size(49, 28); this.Button26.TabIndex = 83; this.Button26.Text = "C"; - this.Button26.UseVisualStyleBackColor = true; this.Button26.Click += new System.EventHandler(this.Button26_Click); // // Button1 // + this.Button1.AdaptFontWithTheme = false; + this.Button1.AdaptForeColorWithTheme = false; this.Button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button1.ForeColor = System.Drawing.Color.Red; this.Button1.Location = new System.Drawing.Point(11, 139); @@ -196,12 +197,12 @@ this.Button1.Size = new System.Drawing.Size(36, 28); this.Button1.TabIndex = 58; this.Button1.Text = "MR"; - this.Button1.UseVisualStyleBackColor = true; // // Button25 // + this.Button25.AdaptFontWithTheme = false; + this.Button25.AdaptForeColorWithTheme = false; this.Button25.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.Button25.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button25.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button25.ForeColor = System.Drawing.Color.Firebrick; this.Button25.Location = new System.Drawing.Point(104, 71); @@ -209,13 +210,13 @@ this.Button25.Size = new System.Drawing.Size(49, 28); this.Button25.TabIndex = 82; this.Button25.Text = "Back"; - this.Button25.UseVisualStyleBackColor = true; this.Button25.Click += new System.EventHandler(this.Button25_Click); // // Button2 // + this.Button2.AdaptFontWithTheme = false; + this.Button2.AdaptForeColorWithTheme = false; this.Button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button2.ForeColor = System.Drawing.Color.Red; this.Button2.Location = new System.Drawing.Point(11, 207); @@ -223,12 +224,12 @@ this.Button2.Size = new System.Drawing.Size(36, 28); this.Button2.TabIndex = 59; this.Button2.Text = "M+"; - this.Button2.UseVisualStyleBackColor = true; // // Button21 // + this.Button21.AdaptFontWithTheme = false; + this.Button21.AdaptForeColorWithTheme = false; this.Button21.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.Button21.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button21.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button21.ForeColor = System.Drawing.Color.Red; this.Button21.Location = new System.Drawing.Point(223, 207); @@ -236,13 +237,13 @@ this.Button21.Size = new System.Drawing.Size(36, 28); this.Button21.TabIndex = 81; this.Button21.Text = "="; - this.Button21.UseVisualStyleBackColor = true; this.Button21.Click += new System.EventHandler(this.Button21_Click); // // Button3 // + this.Button3.AdaptFontWithTheme = false; + this.Button3.AdaptForeColorWithTheme = false; this.Button3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button3.ForeColor = System.Drawing.Color.Red; this.Button3.Location = new System.Drawing.Point(11, 173); @@ -250,12 +251,12 @@ this.Button3.Size = new System.Drawing.Size(36, 28); this.Button3.TabIndex = 60; this.Button3.Text = "MS"; - this.Button3.UseVisualStyleBackColor = true; // // Button22 // + this.Button22.AdaptFontWithTheme = false; + this.Button22.AdaptForeColorWithTheme = false; this.Button22.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.Button22.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button22.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button22.ForeColor = System.Drawing.Color.MidnightBlue; this.Button22.Location = new System.Drawing.Point(223, 105); @@ -263,14 +264,13 @@ this.Button22.Size = new System.Drawing.Size(36, 28); this.Button22.TabIndex = 80; this.Button22.Text = "sqrt"; - this.Button22.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.Button22.UseVisualStyleBackColor = true; this.Button22.Click += new System.EventHandler(this.arithmitic_click); // // Button4 - // + // + this.Button4.AdaptFontWithTheme = false; + this.Button4.AdaptForeColorWithTheme = false; this.Button4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button4.ForeColor = System.Drawing.Color.Red; this.Button4.Location = new System.Drawing.Point(11, 105); @@ -278,12 +278,12 @@ this.Button4.Size = new System.Drawing.Size(36, 28); this.Button4.TabIndex = 61; this.Button4.Text = "MC"; - this.Button4.UseVisualStyleBackColor = true; // // Button23 // + this.Button23.AdaptFontWithTheme = false; + this.Button23.AdaptForeColorWithTheme = false; this.Button23.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.Button23.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button23.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button23.ForeColor = System.Drawing.Color.MidnightBlue; this.Button23.Location = new System.Drawing.Point(223, 173); @@ -291,13 +291,13 @@ this.Button23.Size = new System.Drawing.Size(36, 28); this.Button23.TabIndex = 79; this.Button23.Text = "1/x"; - this.Button23.UseVisualStyleBackColor = true; this.Button23.Click += new System.EventHandler(this.arithmitic_click); // // Button11 // + this.Button11.AdaptFontWithTheme = false; + this.Button11.AdaptForeColorWithTheme = false; this.Button11.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.Button11.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button11.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button11.ForeColor = System.Drawing.Color.Blue; this.Button11.Location = new System.Drawing.Point(143, 105); @@ -305,13 +305,13 @@ this.Button11.Size = new System.Drawing.Size(36, 28); this.Button11.TabIndex = 70; this.Button11.Text = "9"; - this.Button11.UseVisualStyleBackColor = true; this.Button11.Click += new System.EventHandler(this.number_click); // // Button7 // + this.Button7.AdaptFontWithTheme = false; + this.Button7.AdaptForeColorWithTheme = false; this.Button7.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.Button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button7.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button7.ForeColor = System.Drawing.Color.Blue; this.Button7.Location = new System.Drawing.Point(63, 139); @@ -319,13 +319,13 @@ this.Button7.Size = new System.Drawing.Size(36, 28); this.Button7.TabIndex = 62; this.Button7.Text = "4"; - this.Button7.UseVisualStyleBackColor = true; this.Button7.Click += new System.EventHandler(this.number_click); // // Button16 // + this.Button16.AdaptFontWithTheme = false; + this.Button16.AdaptForeColorWithTheme = false; this.Button16.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.Button16.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button16.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button16.ForeColor = System.Drawing.Color.Blue; this.Button16.Location = new System.Drawing.Point(63, 207); @@ -333,13 +333,13 @@ this.Button16.Size = new System.Drawing.Size(36, 28); this.Button16.TabIndex = 71; this.Button16.Text = "0"; - this.Button16.UseVisualStyleBackColor = true; this.Button16.Click += new System.EventHandler(this.number_click); // // Button24 // + this.Button24.AdaptFontWithTheme = false; + this.Button24.AdaptForeColorWithTheme = false; this.Button24.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.Button24.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button24.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button24.ForeColor = System.Drawing.Color.MidnightBlue; this.Button24.Location = new System.Drawing.Point(223, 139); @@ -347,13 +347,13 @@ this.Button24.Size = new System.Drawing.Size(36, 28); this.Button24.TabIndex = 78; this.Button24.Text = "%"; - this.Button24.UseVisualStyleBackColor = true; this.Button24.Click += new System.EventHandler(this.arithmitic_click); // // Button12 // + this.Button12.AdaptFontWithTheme = false; + this.Button12.AdaptForeColorWithTheme = false; this.Button12.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.Button12.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button12.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button12.ForeColor = System.Drawing.Color.Blue; this.Button12.Location = new System.Drawing.Point(143, 173); @@ -361,13 +361,13 @@ this.Button12.Size = new System.Drawing.Size(36, 28); this.Button12.TabIndex = 69; this.Button12.Text = "3"; - this.Button12.UseVisualStyleBackColor = true; this.Button12.Click += new System.EventHandler(this.number_click); // // one // + this.one.AdaptFontWithTheme = false; + this.one.AdaptForeColorWithTheme = false; this.one.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.one.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.one.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.one.ForeColor = System.Drawing.Color.Blue; this.one.Location = new System.Drawing.Point(63, 173); @@ -375,13 +375,13 @@ this.one.Size = new System.Drawing.Size(36, 28); this.one.TabIndex = 63; this.one.Text = "1"; - this.one.UseVisualStyleBackColor = true; this.one.Click += new System.EventHandler(this.number_click); // // Button15 // + this.Button15.AdaptFontWithTheme = false; + this.Button15.AdaptForeColorWithTheme = false; this.Button15.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.Button15.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button15.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button15.ForeColor = System.Drawing.Color.Blue; this.Button15.Location = new System.Drawing.Point(103, 207); @@ -389,13 +389,13 @@ this.Button15.Size = new System.Drawing.Size(36, 28); this.Button15.TabIndex = 72; this.Button15.Text = "+/-"; - this.Button15.UseVisualStyleBackColor = true; this.Button15.Click += new System.EventHandler(this.Button15_Click); // // Button17 // + this.Button17.AdaptFontWithTheme = false; + this.Button17.AdaptForeColorWithTheme = false; this.Button17.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.Button17.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button17.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button17.ForeColor = System.Drawing.Color.Red; this.Button17.Location = new System.Drawing.Point(183, 207); @@ -403,13 +403,13 @@ this.Button17.Size = new System.Drawing.Size(36, 28); this.Button17.TabIndex = 77; this.Button17.Text = "+"; - this.Button17.UseVisualStyleBackColor = true; this.Button17.Click += new System.EventHandler(this.arithmitic_click); // // Button13 // + this.Button13.AdaptFontWithTheme = false; + this.Button13.AdaptForeColorWithTheme = false; this.Button13.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.Button13.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button13.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button13.ForeColor = System.Drawing.Color.Blue; this.Button13.Location = new System.Drawing.Point(143, 139); @@ -417,13 +417,13 @@ this.Button13.Size = new System.Drawing.Size(36, 28); this.Button13.TabIndex = 68; this.Button13.Text = "6"; - this.Button13.UseVisualStyleBackColor = true; this.Button13.Click += new System.EventHandler(this.number_click); // // Button5 // + this.Button5.AdaptFontWithTheme = false; + this.Button5.AdaptForeColorWithTheme = false; this.Button5.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.Button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button5.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button5.ForeColor = System.Drawing.Color.Blue; this.Button5.Location = new System.Drawing.Point(63, 105); @@ -431,13 +431,13 @@ this.Button5.Size = new System.Drawing.Size(36, 28); this.Button5.TabIndex = 64; this.Button5.Text = "7"; - this.Button5.UseVisualStyleBackColor = true; this.Button5.Click += new System.EventHandler(this.number_click); // // Button14 // + this.Button14.AdaptFontWithTheme = false; + this.Button14.AdaptForeColorWithTheme = false; this.Button14.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.Button14.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button14.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button14.ForeColor = System.Drawing.Color.Blue; this.Button14.Location = new System.Drawing.Point(143, 207); @@ -445,13 +445,13 @@ this.Button14.Size = new System.Drawing.Size(36, 28); this.Button14.TabIndex = 73; this.Button14.Text = "."; - this.Button14.UseVisualStyleBackColor = true; this.Button14.Click += new System.EventHandler(this.number_click); // // Button18 // + this.Button18.AdaptFontWithTheme = false; + this.Button18.AdaptForeColorWithTheme = false; this.Button18.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.Button18.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button18.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button18.ForeColor = System.Drawing.Color.Red; this.Button18.Location = new System.Drawing.Point(183, 105); @@ -459,13 +459,13 @@ this.Button18.Size = new System.Drawing.Size(36, 28); this.Button18.TabIndex = 76; this.Button18.Text = "/"; - this.Button18.UseVisualStyleBackColor = true; this.Button18.Click += new System.EventHandler(this.arithmitic_click); // // Button8 // + this.Button8.AdaptFontWithTheme = false; + this.Button8.AdaptForeColorWithTheme = false; this.Button8.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button8.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button8.ForeColor = System.Drawing.Color.Blue; this.Button8.Location = new System.Drawing.Point(103, 105); @@ -473,13 +473,13 @@ this.Button8.Size = new System.Drawing.Size(36, 28); this.Button8.TabIndex = 67; this.Button8.Text = "8"; - this.Button8.UseVisualStyleBackColor = true; this.Button8.Click += new System.EventHandler(this.number_click); // // Button10 // + this.Button10.AdaptFontWithTheme = false; + this.Button10.AdaptForeColorWithTheme = false; this.Button10.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.Button10.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button10.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button10.ForeColor = System.Drawing.Color.Blue; this.Button10.Location = new System.Drawing.Point(103, 139); @@ -487,13 +487,13 @@ this.Button10.Size = new System.Drawing.Size(36, 28); this.Button10.TabIndex = 65; this.Button10.Text = "5"; - this.Button10.UseVisualStyleBackColor = true; this.Button10.Click += new System.EventHandler(this.number_click); // // Button20 // + this.Button20.AdaptFontWithTheme = false; + this.Button20.AdaptForeColorWithTheme = false; this.Button20.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.Button20.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button20.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button20.ForeColor = System.Drawing.Color.Red; this.Button20.Location = new System.Drawing.Point(183, 139); @@ -501,13 +501,13 @@ this.Button20.Size = new System.Drawing.Size(36, 28); this.Button20.TabIndex = 74; this.Button20.Text = "*"; - this.Button20.UseVisualStyleBackColor = true; this.Button20.Click += new System.EventHandler(this.arithmitic_click); // // Button19 // + this.Button19.AdaptFontWithTheme = false; + this.Button19.AdaptForeColorWithTheme = false; this.Button19.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.Button19.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button19.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button19.ForeColor = System.Drawing.Color.Red; this.Button19.Location = new System.Drawing.Point(183, 173); @@ -515,13 +515,13 @@ this.Button19.Size = new System.Drawing.Size(36, 28); this.Button19.TabIndex = 75; this.Button19.Text = "-"; - this.Button19.UseVisualStyleBackColor = true; this.Button19.Click += new System.EventHandler(this.arithmitic_click); // // Button9 // + this.Button9.AdaptFontWithTheme = false; + this.Button9.AdaptForeColorWithTheme = false; this.Button9.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.Button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button9.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button9.ForeColor = System.Drawing.Color.Blue; this.Button9.Location = new System.Drawing.Point(103, 173); @@ -529,7 +529,6 @@ this.Button9.Size = new System.Drawing.Size(36, 28); this.Button9.TabIndex = 66; this.Button9.Text = "2"; - this.Button9.UseVisualStyleBackColor = true; this.Button9.Click += new System.EventHandler(this.number_click); // // MenuStrip2 @@ -613,33 +612,33 @@ internal System.Windows.Forms.ToolStripMenuItem CopyCtrlCToolStripMenuItem1; internal System.Windows.Forms.ToolStripMenuItem EditToolStripMenuItem1; internal System.Windows.Forms.TextBox txtNumbers; - internal System.Windows.Forms.Button Button27; - internal System.Windows.Forms.Button Button26; - internal System.Windows.Forms.Button Button1; - internal System.Windows.Forms.Button Button25; - internal System.Windows.Forms.Button Button2; - internal System.Windows.Forms.Button Button21; - internal System.Windows.Forms.Button Button3; - internal System.Windows.Forms.Button Button22; - internal System.Windows.Forms.Button Button4; - internal System.Windows.Forms.Button Button23; - internal System.Windows.Forms.Button Button11; - internal System.Windows.Forms.Button Button7; - internal System.Windows.Forms.Button Button16; - internal System.Windows.Forms.Button Button24; - internal System.Windows.Forms.Button Button12; - internal System.Windows.Forms.Button one; - internal System.Windows.Forms.Button Button15; - internal System.Windows.Forms.Button Button17; - internal System.Windows.Forms.Button Button13; - internal System.Windows.Forms.Button Button5; - internal System.Windows.Forms.Button Button14; - internal System.Windows.Forms.Button Button18; - internal System.Windows.Forms.Button Button8; - internal System.Windows.Forms.Button Button10; - internal System.Windows.Forms.Button Button20; - internal System.Windows.Forms.Button Button19; - internal System.Windows.Forms.Button Button9; + internal Histacom2.Engine.UI.ClassicButton Button27; + internal Histacom2.Engine.UI.ClassicButton Button26; + internal Histacom2.Engine.UI.ClassicButton Button1; + internal Histacom2.Engine.UI.ClassicButton Button25; + internal Histacom2.Engine.UI.ClassicButton Button2; + internal Histacom2.Engine.UI.ClassicButton Button21; + internal Histacom2.Engine.UI.ClassicButton Button3; + internal Histacom2.Engine.UI.ClassicButton Button22; + internal Histacom2.Engine.UI.ClassicButton Button4; + internal Histacom2.Engine.UI.ClassicButton Button23; + internal Histacom2.Engine.UI.ClassicButton Button11; + internal Histacom2.Engine.UI.ClassicButton Button7; + internal Histacom2.Engine.UI.ClassicButton Button16; + internal Histacom2.Engine.UI.ClassicButton Button24; + internal Histacom2.Engine.UI.ClassicButton Button12; + internal Histacom2.Engine.UI.ClassicButton one; + internal Histacom2.Engine.UI.ClassicButton Button15; + internal Histacom2.Engine.UI.ClassicButton Button17; + internal Histacom2.Engine.UI.ClassicButton Button13; + internal Histacom2.Engine.UI.ClassicButton Button5; + internal Histacom2.Engine.UI.ClassicButton Button14; + internal Histacom2.Engine.UI.ClassicButton Button18; + internal Histacom2.Engine.UI.ClassicButton Button8; + internal Histacom2.Engine.UI.ClassicButton Button10; + internal Histacom2.Engine.UI.ClassicButton Button20; + internal Histacom2.Engine.UI.ClassicButton Button19; + internal Histacom2.Engine.UI.ClassicButton Button9; internal System.Windows.Forms.MenuStrip MenuStrip2; private System.Windows.Forms.PictureBox pictureBox1; } diff --git a/Histacom2/OS/Win95/Win95.cs b/Histacom2/OS/Win95/Win95.cs index 27c8915..eb6b018 100644 --- a/Histacom2/OS/Win95/Win95.cs +++ b/Histacom2/OS/Win95/Win95.cs @@ -76,9 +76,6 @@ namespace Histacom2.OS.Win95 private void Desktop_Load(object sender, EventArgs e) { if (currentTheme.defaultWallpaper != null) desktopicons.BackgroundImage = new Bitmap(currentTheme.defaultWallpaper, Width, Height); - //Start Menu Color - Commented until it works reliably - //startmenuitems.Renderer = new MyRenderer(); - //ProgramsToolStripMenuItem.DropDown.Renderer = new MyRenderer(); // Make Font Mandatory fontLoad(); @@ -144,8 +141,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))); @@ -658,29 +655,5 @@ namespace Histacom2.OS.Win95 gfx.DrawLine(new Pen(_lightBack), startmenu.Width - 3, 1, 1, 1); } } - public class MyRenderer : ToolStripProfessionalRenderer - { - public MyRenderer() : base(new MyColors()) { } - } - - public class MyColors : ProfessionalColorTable - { - public override Color MenuItemSelectedGradientBegin - { - get { return Color.Navy; } - } - public override Color MenuItemSelectedGradientEnd - { - get { return Color.Navy; } - } - public override Color MenuItemPressedGradientBegin - { - get { return Color.Navy; } - } - public override Color MenuItemPressedGradientEnd - { - get { return Color.Navy; } - } - } } diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs index f22ee89..2529e10 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs @@ -77,19 +77,16 @@ namespace Histacom2.OS.Win95.Win95Apps case "Default": SaveSystem.CurrentSave.ThemeName = "default95"; SaveSystem.currentTheme = new Default95Theme(); - TitleScreen.frm95.BackgroundImage = null; TitleScreen.frm95.desktopicons.BackgroundImage = null; break; case "Dangerous Creatures": SaveSystem.CurrentSave.ThemeName = "dangeranimals"; SaveSystem.currentTheme = new DangerousCreaturesTheme(); - TitleScreen.frm95.BackgroundImage = Properties.Resources.DCTheme_BG; TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.DCTheme_BG, TitleScreen.frm95.Width, TitleScreen.frm95.Height); break; case "Inside Your Computer": SaveSystem.CurrentSave.ThemeName = "insidepc"; SaveSystem.currentTheme = new InsideComputerTheme(); - TitleScreen.frm95.BackgroundImage = Properties.Resources.ICTheme_BG; TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.ICTheme_BG, TitleScreen.frm95.Width, TitleScreen.frm95.Height); break; } diff --git a/Histacom2/OS/Win95/Win95TaskBarItem.Designer.cs b/Histacom2/OS/Win95/Win95TaskBarItem.Designer.cs index 844e47b..c6c4952 100644 --- a/Histacom2/OS/Win95/Win95TaskBarItem.Designer.cs +++ b/Histacom2/OS/Win95/Win95TaskBarItem.Designer.cs @@ -67,6 +67,7 @@ this.panel1.Name = "panel1"; this.panel1.Size = new System.Drawing.Size(160, 22); this.panel1.TabIndex = 2; + this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint); // // Win95TaskBarItem // diff --git a/Histacom2/OS/Win95/Win95TaskBarItem.cs b/Histacom2/OS/Win95/Win95TaskBarItem.cs index b13e25c..f550497 100644 --- a/Histacom2/OS/Win95/Win95TaskBarItem.cs +++ b/Histacom2/OS/Win95/Win95TaskBarItem.cs @@ -39,5 +39,22 @@ namespace Histacom2.Engine.Template.Taskbars { tb.FocusAppFromID(ApplicationID); } + + private void panel1_Paint(object sender, PaintEventArgs e) + { + if (SaveSystem.currentTheme != null) BackColor = SaveSystem.currentTheme.threeDObjectsColor; + else BackColor = Color.Silver; + + var _lightBack = Paintbrush.GetLightFromColor(BackColor); + var _darkBack = Paintbrush.GetDarkFromColor(BackColor); + + var g = e.Graphics; + g.Clear(BackColor); + + 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)); + } } } -- 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/UI') 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 From f91f90f8dbd75fbc98217adf78576532d8078d31 Mon Sep 17 00:00:00 2001 From: lempamo Date: Tue, 19 Sep 2017 00:04:20 -0400 Subject: New IE4 Home Page --- Histacom2.Engine/UI/ClassicLabel.cs | 4 +- Histacom2/Histacom2.csproj | 24 + .../Win95/Win95Apps/IE3Sites/IE3Start.Designer.cs | 2 +- .../Win98Apps/IE4Sites/IE4HomePage.Designer.cs | 822 +++++++++++++++++++++ .../OS/Win98/Win98Apps/IE4Sites/IE4HomePage.cs | 34 + .../OS/Win98/Win98Apps/IE4Sites/IE4HomePage.resx | 132 ++++ .../OS/Win98/Win98Apps/WinClassicIE4.Designer.cs | 197 ++--- Histacom2/OS/Win98/Win98Apps/WinClassicIE4.cs | 5 +- Histacom2/OS/Win98/Win98Apps/WinClassicIE4.resx | 123 +++ Histacom2/Properties/Resources.resx | 47 +- Histacom2/Properties/Resources1.Designer.cs | 172 +++-- Histacom2/Resources/IE4/IE4Home_AboutIE5.png | Bin 0 -> 2800 bytes Histacom2/Resources/IE4/IE4Home_HDots.png | Bin 0 -> 152 bytes Histacom2/Resources/IE4/IE4Home_IE4CD.png | Bin 0 -> 1479 bytes Histacom2/Resources/IE4/IE4Home_MSBG.png | Bin 0 -> 158 bytes Histacom2/Resources/IE4/IE4Home_MSHome.png | Bin 0 -> 386 bytes Histacom2/Resources/IE4/IE4Home_MSLogo.png | Bin 0 -> 673 bytes Histacom2/Resources/IE4/IE4Home_SecUpdate.png | Bin 0 -> 286 bytes Histacom2/Resources/IE4/IE4Home_WinTechBG.png | Bin 0 -> 170 bytes Histacom2/Resources/IE4/IE4Home_WinTechHome.png | Bin 0 -> 319 bytes Histacom2/Resources/IE4/IE4Home_WinTechIE.png | Bin 0 -> 1588 bytes Histacom2/Resources/IE4/IE4Home_WinTechLogo.png | Bin 0 -> 3524 bytes Histacom2/Resources/IE4/start.png | Bin 28819 -> 27565 bytes 23 files changed, 1396 insertions(+), 166 deletions(-) create mode 100644 Histacom2/OS/Win98/Win98Apps/IE4Sites/IE4HomePage.Designer.cs create mode 100644 Histacom2/OS/Win98/Win98Apps/IE4Sites/IE4HomePage.cs create mode 100644 Histacom2/OS/Win98/Win98Apps/IE4Sites/IE4HomePage.resx create mode 100644 Histacom2/OS/Win98/Win98Apps/WinClassicIE4.resx create mode 100644 Histacom2/Resources/IE4/IE4Home_AboutIE5.png create mode 100644 Histacom2/Resources/IE4/IE4Home_HDots.png create mode 100644 Histacom2/Resources/IE4/IE4Home_IE4CD.png create mode 100644 Histacom2/Resources/IE4/IE4Home_MSBG.png create mode 100644 Histacom2/Resources/IE4/IE4Home_MSHome.png create mode 100644 Histacom2/Resources/IE4/IE4Home_MSLogo.png create mode 100644 Histacom2/Resources/IE4/IE4Home_SecUpdate.png create mode 100644 Histacom2/Resources/IE4/IE4Home_WinTechBG.png create mode 100644 Histacom2/Resources/IE4/IE4Home_WinTechHome.png create mode 100644 Histacom2/Resources/IE4/IE4Home_WinTechIE.png create mode 100644 Histacom2/Resources/IE4/IE4Home_WinTechLogo.png (limited to 'Histacom2.Engine/UI') diff --git a/Histacom2.Engine/UI/ClassicLabel.cs b/Histacom2.Engine/UI/ClassicLabel.cs index 0b9d9c2..f207eb1 100644 --- a/Histacom2.Engine/UI/ClassicLabel.cs +++ b/Histacom2.Engine/UI/ClassicLabel.cs @@ -21,9 +21,11 @@ namespace Histacom2.Engine.UI { base.OnPaint(e); var gfx = e.Graphics; + gfx.Clear(BackColor); gfx.TextRenderingHint = System.Drawing.Text.TextRenderingHint.SingleBitPerPixelGridFit; - gfx.DrawString(Text, Font, new SolidBrush(ForeColor), 0, 0); + gfx.DrawString(Text, Font, new SolidBrush(ForeColor), ClientRectangle); + Height = (int)gfx.MeasureString(Text, Font, ClientRectangle.Width).Height; } } } diff --git a/Histacom2/Histacom2.csproj b/Histacom2/Histacom2.csproj index cdf7138..4938a45 100644 --- a/Histacom2/Histacom2.csproj +++ b/Histacom2/Histacom2.csproj @@ -268,6 +268,12 @@ Win98.cs + + UserControl + + + IE4HomePage.cs + UserControl @@ -458,10 +464,16 @@ Win98.cs Designer + + IE4HomePage.cs + IENoPage.cs Designer + + WinClassicIE4.cs + WinClassicWindowsExplorer.cs Designer @@ -546,6 +558,7 @@ + @@ -591,6 +604,17 @@ + + + + + + + + + + + diff --git a/Histacom2/OS/Win95/Win95Apps/IE3Sites/IE3Start.Designer.cs b/Histacom2/OS/Win95/Win95Apps/IE3Sites/IE3Start.Designer.cs index c6f7988..920715b 100644 --- a/Histacom2/OS/Win95/Win95Apps/IE3Sites/IE3Start.Designer.cs +++ b/Histacom2/OS/Win95/Win95Apps/IE3Sites/IE3Start.Designer.cs @@ -36,7 +36,7 @@ // // pictureBox1 // - this.pictureBox1.Image = global::Histacom2.Properties.Resources.start; + this.pictureBox1.Image = global::Histacom2.Properties.Resources.IE3_Start; this.pictureBox1.Location = new System.Drawing.Point(0, 0); this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Size = new System.Drawing.Size(640, 480); diff --git a/Histacom2/OS/Win98/Win98Apps/IE4Sites/IE4HomePage.Designer.cs b/Histacom2/OS/Win98/Win98Apps/IE4Sites/IE4HomePage.Designer.cs new file mode 100644 index 0000000..7f3bae1 --- /dev/null +++ b/Histacom2/OS/Win98/Win98Apps/IE4Sites/IE4HomePage.Designer.cs @@ -0,0 +1,822 @@ +namespace Histacom2.OS.Win98.Win98Apps.IE4Sites +{ + partial class IE4HomePage + { + /// + /// 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() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(IE4HomePage)); + this.panel1 = new System.Windows.Forms.Panel(); + this.pictureBox2 = new System.Windows.Forms.PictureBox(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.panel2 = new System.Windows.Forms.Panel(); + this.pictureBox3 = new System.Windows.Forms.PictureBox(); + this.panel3 = new System.Windows.Forms.Panel(); + this.pictureBox5 = new System.Windows.Forms.PictureBox(); + this.pictureBox4 = new System.Windows.Forms.PictureBox(); + this.panel4 = new System.Windows.Forms.Panel(); + this.classicLabel22 = new Histacom2.Engine.UI.ClassicLabel(); + this.classicLabel21 = new Histacom2.Engine.UI.ClassicLabel(); + this.panel13 = new System.Windows.Forms.Panel(); + this.classicLabel20 = new Histacom2.Engine.UI.ClassicLabel(); + this.pictureBox14 = new System.Windows.Forms.PictureBox(); + this.classicLabel19 = new Histacom2.Engine.UI.ClassicLabel(); + this.pictureBox13 = new System.Windows.Forms.PictureBox(); + this.classicLabel18 = new Histacom2.Engine.UI.ClassicLabel(); + this.pictureBox12 = new System.Windows.Forms.PictureBox(); + this.classicLabel17 = new Histacom2.Engine.UI.ClassicLabel(); + this.pictureBox11 = new System.Windows.Forms.PictureBox(); + this.classicLabel16 = new Histacom2.Engine.UI.ClassicLabel(); + this.pictureBox10 = new System.Windows.Forms.PictureBox(); + this.classicLabel14 = new Histacom2.Engine.UI.ClassicLabel(); + this.pictureBox9 = new System.Windows.Forms.PictureBox(); + this.classicLabel13 = new Histacom2.Engine.UI.ClassicLabel(); + this.pictureBox8 = new System.Windows.Forms.PictureBox(); + this.classicLabel12 = new Histacom2.Engine.UI.ClassicLabel(); + this.panel5 = new System.Windows.Forms.Panel(); + this.panel15 = new System.Windows.Forms.Panel(); + this.classicLabel24 = new Histacom2.Engine.UI.ClassicLabel(); + this.pictureBox15 = new System.Windows.Forms.PictureBox(); + this.classicLabel23 = new Histacom2.Engine.UI.ClassicLabel(); + this.panel14 = new System.Windows.Forms.Panel(); + this.panel11 = new System.Windows.Forms.Panel(); + this.classicLabel11 = new Histacom2.Engine.UI.ClassicLabel(); + this.pictureBox7 = new System.Windows.Forms.PictureBox(); + this.classicLabel10 = new Histacom2.Engine.UI.ClassicLabel(); + this.panel6 = new System.Windows.Forms.Panel(); + this.classicLabel15 = new Histacom2.Engine.UI.ClassicLabel(); + this.panel12 = new System.Windows.Forms.Panel(); + this.classicLabel9 = new Histacom2.Engine.UI.ClassicLabel(); + this.classicLabel8 = new Histacom2.Engine.UI.ClassicLabel(); + this.panel10 = new System.Windows.Forms.Panel(); + this.classicLabel7 = new Histacom2.Engine.UI.ClassicLabel(); + this.classicLabel6 = new Histacom2.Engine.UI.ClassicLabel(); + this.panel9 = new System.Windows.Forms.Panel(); + this.panel8 = new System.Windows.Forms.Panel(); + this.classicLabel5 = new Histacom2.Engine.UI.ClassicLabel(); + this.classicLabel4 = new Histacom2.Engine.UI.ClassicLabel(); + this.pictureBox6 = new System.Windows.Forms.PictureBox(); + this.classicLabel3 = new Histacom2.Engine.UI.ClassicLabel(); + this.classicLabel2 = new Histacom2.Engine.UI.ClassicLabel(); + this.classicLabel1 = new Histacom2.Engine.UI.ClassicLabel(); + this.panel7 = new System.Windows.Forms.Panel(); + this.classicLabel25 = new Histacom2.Engine.UI.ClassicLabel(); + this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.panel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit(); + this.panel3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit(); + this.panel4.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox14)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox13)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox12)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox11)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox10)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox9)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox8)).BeginInit(); + this.panel5.SuspendLayout(); + this.panel15.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox15)).BeginInit(); + this.panel11.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).BeginInit(); + this.panel6.SuspendLayout(); + this.panel8.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).BeginInit(); + this.SuspendLayout(); + // + // panel1 + // + this.panel1.BackgroundImage = global::Histacom2.Properties.Resources.IE4Home_MSBG; + this.panel1.Controls.Add(this.pictureBox2); + this.panel1.Controls.Add(this.pictureBox1); + this.panel1.Dock = System.Windows.Forms.DockStyle.Top; + this.panel1.Location = new System.Drawing.Point(0, 0); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(959, 21); + this.panel1.TabIndex = 0; + // + // pictureBox2 + // + this.pictureBox2.BackgroundImage = global::Histacom2.Properties.Resources.IE4Home_MSLogo; + this.pictureBox2.Dock = System.Windows.Forms.DockStyle.Right; + this.pictureBox2.Location = new System.Drawing.Point(868, 0); + this.pictureBox2.Name = "pictureBox2"; + this.pictureBox2.Size = new System.Drawing.Size(91, 21); + this.pictureBox2.TabIndex = 1; + this.pictureBox2.TabStop = false; + // + // pictureBox1 + // + this.pictureBox1.BackgroundImage = global::Histacom2.Properties.Resources.IE4Home_MSHome; + this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Left; + this.pictureBox1.Location = new System.Drawing.Point(0, 0); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(104, 21); + this.pictureBox1.TabIndex = 0; + this.pictureBox1.TabStop = false; + // + // panel2 + // + this.panel2.BackgroundImage = global::Histacom2.Properties.Resources.IE4Home_WinTechBG; + this.panel2.Controls.Add(this.pictureBox3); + this.panel2.Dock = System.Windows.Forms.DockStyle.Top; + this.panel2.Location = new System.Drawing.Point(0, 21); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(959, 41); + this.panel2.TabIndex = 1; + // + // pictureBox3 + // + this.pictureBox3.BackgroundImage = global::Histacom2.Properties.Resources.IE4Home_WinTechLogo; + this.pictureBox3.Dock = System.Windows.Forms.DockStyle.Left; + this.pictureBox3.Location = new System.Drawing.Point(0, 0); + this.pictureBox3.Name = "pictureBox3"; + this.pictureBox3.Size = new System.Drawing.Size(384, 41); + this.pictureBox3.TabIndex = 0; + this.pictureBox3.TabStop = false; + // + // panel3 + // + this.panel3.Controls.Add(this.pictureBox5); + this.panel3.Controls.Add(this.pictureBox4); + this.panel3.Dock = System.Windows.Forms.DockStyle.Top; + this.panel3.Location = new System.Drawing.Point(0, 62); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(959, 27); + this.panel3.TabIndex = 2; + // + // pictureBox5 + // + this.pictureBox5.Dock = System.Windows.Forms.DockStyle.Left; + this.pictureBox5.Image = global::Histacom2.Properties.Resources.IE4Home_WinTechIE; + this.pictureBox5.Location = new System.Drawing.Point(40, 0); + this.pictureBox5.Name = "pictureBox5"; + this.pictureBox5.Padding = new System.Windows.Forms.Padding(155, 0, 0, 0); + this.pictureBox5.Size = new System.Drawing.Size(360, 27); + this.pictureBox5.TabIndex = 1; + this.pictureBox5.TabStop = false; + // + // pictureBox4 + // + this.pictureBox4.BackgroundImage = global::Histacom2.Properties.Resources.IE4Home_WinTechHome; + this.pictureBox4.Dock = System.Windows.Forms.DockStyle.Left; + this.pictureBox4.Location = new System.Drawing.Point(0, 0); + this.pictureBox4.Name = "pictureBox4"; + this.pictureBox4.Size = new System.Drawing.Size(40, 27); + this.pictureBox4.TabIndex = 0; + this.pictureBox4.TabStop = false; + // + // panel4 + // + this.panel4.Controls.Add(this.classicLabel22); + this.panel4.Controls.Add(this.classicLabel21); + this.panel4.Controls.Add(this.panel13); + this.panel4.Controls.Add(this.classicLabel20); + this.panel4.Controls.Add(this.pictureBox14); + this.panel4.Controls.Add(this.classicLabel19); + this.panel4.Controls.Add(this.pictureBox13); + this.panel4.Controls.Add(this.classicLabel18); + this.panel4.Controls.Add(this.pictureBox12); + this.panel4.Controls.Add(this.classicLabel17); + this.panel4.Controls.Add(this.pictureBox11); + this.panel4.Controls.Add(this.classicLabel16); + this.panel4.Controls.Add(this.pictureBox10); + this.panel4.Controls.Add(this.classicLabel14); + this.panel4.Controls.Add(this.pictureBox9); + this.panel4.Controls.Add(this.classicLabel13); + this.panel4.Controls.Add(this.pictureBox8); + this.panel4.Controls.Add(this.classicLabel12); + this.panel4.Dock = System.Windows.Forms.DockStyle.Left; + this.panel4.Location = new System.Drawing.Point(0, 90); + this.panel4.Name = "panel4"; + this.panel4.Padding = new System.Windows.Forms.Padding(0, 5, 15, 0); + this.panel4.Size = new System.Drawing.Size(212, 452); + this.panel4.TabIndex = 3; + // + // classicLabel22 + // + this.classicLabel22.Dock = System.Windows.Forms.DockStyle.Top; + this.classicLabel22.Font = new System.Drawing.Font("Verdana", 8.25F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.classicLabel22.ForeColor = System.Drawing.Color.Navy; + this.classicLabel22.Location = new System.Drawing.Point(0, 209); + this.classicLabel22.Name = "classicLabel22"; + this.classicLabel22.Size = new System.Drawing.Size(197, 14); + this.classicLabel22.TabIndex = 20; + this.classicLabel22.Text = " 12padams"; + // + // classicLabel21 + // + this.classicLabel21.Dock = System.Windows.Forms.DockStyle.Top; + this.classicLabel21.Font = new System.Drawing.Font("Verdana", 8.25F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.classicLabel21.ForeColor = System.Drawing.Color.Navy; + this.classicLabel21.Location = new System.Drawing.Point(0, 195); + this.classicLabel21.Name = "classicLabel21"; + this.classicLabel21.Size = new System.Drawing.Size(197, 14); + this.classicLabel21.TabIndex = 19; + this.classicLabel21.Text = " Google"; + // + // panel13 + // + this.panel13.Dock = System.Windows.Forms.DockStyle.Top; + this.panel13.Location = new System.Drawing.Point(0, 180); + this.panel13.Name = "panel13"; + this.panel13.Size = new System.Drawing.Size(197, 15); + this.panel13.TabIndex = 18; + // + // classicLabel20 + // + this.classicLabel20.Dock = System.Windows.Forms.DockStyle.Top; + this.classicLabel20.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold); + this.classicLabel20.ForeColor = System.Drawing.Color.Black; + this.classicLabel20.Location = new System.Drawing.Point(0, 166); + this.classicLabel20.Name = "classicLabel20"; + this.classicLabel20.Size = new System.Drawing.Size(197, 14); + this.classicLabel20.TabIndex = 17; + this.classicLabel20.Text = " Recommended Websites:"; + // + // pictureBox14 + // + this.pictureBox14.BackgroundImage = global::Histacom2.Properties.Resources.IE4Home_HDots; + this.pictureBox14.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pictureBox14.Dock = System.Windows.Forms.DockStyle.Top; + this.pictureBox14.Location = new System.Drawing.Point(0, 157); + this.pictureBox14.Name = "pictureBox14"; + this.pictureBox14.Size = new System.Drawing.Size(197, 9); + this.pictureBox14.TabIndex = 16; + this.pictureBox14.TabStop = false; + // + // classicLabel19 + // + this.classicLabel19.Dock = System.Windows.Forms.DockStyle.Top; + this.classicLabel19.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold); + this.classicLabel19.ForeColor = System.Drawing.Color.Black; + this.classicLabel19.Location = new System.Drawing.Point(0, 143); + this.classicLabel19.Name = "classicLabel19"; + this.classicLabel19.Size = new System.Drawing.Size(197, 14); + this.classicLabel19.TabIndex = 15; + this.classicLabel19.Text = " Business"; + // + // pictureBox13 + // + this.pictureBox13.BackgroundImage = global::Histacom2.Properties.Resources.IE4Home_HDots; + this.pictureBox13.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pictureBox13.Dock = System.Windows.Forms.DockStyle.Top; + this.pictureBox13.Location = new System.Drawing.Point(0, 134); + this.pictureBox13.Name = "pictureBox13"; + this.pictureBox13.Size = new System.Drawing.Size(197, 9); + this.pictureBox13.TabIndex = 14; + this.pictureBox13.TabStop = false; + // + // classicLabel18 + // + this.classicLabel18.Dock = System.Windows.Forms.DockStyle.Top; + this.classicLabel18.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold); + this.classicLabel18.ForeColor = System.Drawing.Color.Black; + this.classicLabel18.Location = new System.Drawing.Point(0, 120); + this.classicLabel18.Name = "classicLabel18"; + this.classicLabel18.Size = new System.Drawing.Size(197, 14); + this.classicLabel18.TabIndex = 13; + this.classicLabel18.Text = " More Info"; + // + // pictureBox12 + // + this.pictureBox12.BackgroundImage = global::Histacom2.Properties.Resources.IE4Home_HDots; + this.pictureBox12.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pictureBox12.Dock = System.Windows.Forms.DockStyle.Top; + this.pictureBox12.Location = new System.Drawing.Point(0, 111); + this.pictureBox12.Name = "pictureBox12"; + this.pictureBox12.Size = new System.Drawing.Size(197, 9); + this.pictureBox12.TabIndex = 12; + this.pictureBox12.TabStop = false; + // + // classicLabel17 + // + this.classicLabel17.Dock = System.Windows.Forms.DockStyle.Top; + this.classicLabel17.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold); + this.classicLabel17.ForeColor = System.Drawing.Color.Black; + this.classicLabel17.Location = new System.Drawing.Point(0, 97); + this.classicLabel17.Name = "classicLabel17"; + this.classicLabel17.Size = new System.Drawing.Size(197, 14); + this.classicLabel17.TabIndex = 11; + this.classicLabel17.Text = " Reviews"; + // + // pictureBox11 + // + this.pictureBox11.BackgroundImage = global::Histacom2.Properties.Resources.IE4Home_HDots; + this.pictureBox11.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pictureBox11.Dock = System.Windows.Forms.DockStyle.Top; + this.pictureBox11.Location = new System.Drawing.Point(0, 88); + this.pictureBox11.Name = "pictureBox11"; + this.pictureBox11.Size = new System.Drawing.Size(197, 9); + this.pictureBox11.TabIndex = 10; + this.pictureBox11.TabStop = false; + // + // classicLabel16 + // + this.classicLabel16.Dock = System.Windows.Forms.DockStyle.Top; + this.classicLabel16.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold); + this.classicLabel16.ForeColor = System.Drawing.Color.Black; + this.classicLabel16.Location = new System.Drawing.Point(0, 74); + this.classicLabel16.Name = "classicLabel16"; + this.classicLabel16.Size = new System.Drawing.Size(197, 14); + this.classicLabel16.TabIndex = 9; + this.classicLabel16.Text = " Download"; + // + // pictureBox10 + // + this.pictureBox10.BackgroundImage = global::Histacom2.Properties.Resources.IE4Home_HDots; + this.pictureBox10.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pictureBox10.Dock = System.Windows.Forms.DockStyle.Top; + this.pictureBox10.Location = new System.Drawing.Point(0, 65); + this.pictureBox10.Name = "pictureBox10"; + this.pictureBox10.Size = new System.Drawing.Size(197, 9); + this.pictureBox10.TabIndex = 8; + this.pictureBox10.TabStop = false; + // + // classicLabel14 + // + this.classicLabel14.Dock = System.Windows.Forms.DockStyle.Top; + this.classicLabel14.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold); + this.classicLabel14.ForeColor = System.Drawing.Color.Black; + this.classicLabel14.Location = new System.Drawing.Point(0, 51); + this.classicLabel14.Name = "classicLabel14"; + this.classicLabel14.Size = new System.Drawing.Size(197, 14); + this.classicLabel14.TabIndex = 7; + this.classicLabel14.Text = " System Requirements"; + // + // pictureBox9 + // + this.pictureBox9.BackgroundImage = global::Histacom2.Properties.Resources.IE4Home_HDots; + this.pictureBox9.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pictureBox9.Dock = System.Windows.Forms.DockStyle.Top; + this.pictureBox9.Location = new System.Drawing.Point(0, 42); + this.pictureBox9.Name = "pictureBox9"; + this.pictureBox9.Size = new System.Drawing.Size(197, 9); + this.pictureBox9.TabIndex = 6; + this.pictureBox9.TabStop = false; + // + // classicLabel13 + // + this.classicLabel13.Dock = System.Windows.Forms.DockStyle.Top; + this.classicLabel13.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold); + this.classicLabel13.ForeColor = System.Drawing.Color.Black; + this.classicLabel13.Location = new System.Drawing.Point(0, 28); + this.classicLabel13.Name = "classicLabel13"; + this.classicLabel13.Size = new System.Drawing.Size(197, 14); + this.classicLabel13.TabIndex = 5; + this.classicLabel13.Text = " Features"; + // + // pictureBox8 + // + this.pictureBox8.BackgroundImage = global::Histacom2.Properties.Resources.IE4Home_HDots; + this.pictureBox8.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.pictureBox8.Dock = System.Windows.Forms.DockStyle.Top; + this.pictureBox8.Location = new System.Drawing.Point(0, 19); + this.pictureBox8.Name = "pictureBox8"; + this.pictureBox8.Size = new System.Drawing.Size(197, 9); + this.pictureBox8.TabIndex = 4; + this.pictureBox8.TabStop = false; + // + // classicLabel12 + // + this.classicLabel12.Dock = System.Windows.Forms.DockStyle.Top; + this.classicLabel12.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold); + this.classicLabel12.ForeColor = System.Drawing.Color.Black; + this.classicLabel12.Location = new System.Drawing.Point(0, 5); + this.classicLabel12.Name = "classicLabel12"; + this.classicLabel12.Size = new System.Drawing.Size(197, 14); + this.classicLabel12.TabIndex = 3; + this.classicLabel12.Text = " Internet Explorer Home Page"; + // + // panel5 + // + this.panel5.Controls.Add(this.panel15); + this.panel5.Controls.Add(this.classicLabel23); + this.panel5.Controls.Add(this.panel14); + this.panel5.Controls.Add(this.panel11); + this.panel5.Controls.Add(this.classicLabel10); + this.panel5.Dock = System.Windows.Forms.DockStyle.Right; + this.panel5.Location = new System.Drawing.Point(797, 90); + this.panel5.Name = "panel5"; + this.panel5.Padding = new System.Windows.Forms.Padding(0, 20, 15, 0); + this.panel5.Size = new System.Drawing.Size(162, 452); + this.panel5.TabIndex = 4; + // + // panel15 + // + this.panel15.Controls.Add(this.classicLabel24); + this.panel15.Controls.Add(this.pictureBox15); + this.panel15.Dock = System.Windows.Forms.DockStyle.Top; + this.panel15.Location = new System.Drawing.Point(0, 165); + this.panel15.Name = "panel15"; + this.panel15.Size = new System.Drawing.Size(147, 68); + this.panel15.TabIndex = 12; + // + // classicLabel24 + // + this.classicLabel24.Dock = System.Windows.Forms.DockStyle.Top; + this.classicLabel24.Font = new System.Drawing.Font("Verdana", 9.25F); + this.classicLabel24.Location = new System.Drawing.Point(25, 0); + this.classicLabel24.Name = "classicLabel24"; + this.classicLabel24.Size = new System.Drawing.Size(122, 61); + this.classicLabel24.TabIndex = 12; + this.classicLabel24.Text = "The latest security patches for Internet Explorer"; + // + // pictureBox15 + // + this.pictureBox15.BackgroundImage = global::Histacom2.Properties.Resources.IE4Home_SecUpdate; + this.pictureBox15.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pictureBox15.Dock = System.Windows.Forms.DockStyle.Left; + this.pictureBox15.Location = new System.Drawing.Point(0, 0); + this.pictureBox15.Name = "pictureBox15"; + this.pictureBox15.Size = new System.Drawing.Size(25, 68); + this.pictureBox15.TabIndex = 0; + this.pictureBox15.TabStop = false; + // + // classicLabel23 + // + this.classicLabel23.Dock = System.Windows.Forms.DockStyle.Top; + this.classicLabel23.Font = new System.Drawing.Font("Verdana", 9.25F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline)))); + this.classicLabel23.ForeColor = System.Drawing.Color.Navy; + this.classicLabel23.Location = new System.Drawing.Point(0, 149); + this.classicLabel23.Name = "classicLabel23"; + this.classicLabel23.Size = new System.Drawing.Size(147, 16); + this.classicLabel23.TabIndex = 11; + this.classicLabel23.Text = "Security Update"; + // + // panel14 + // + this.panel14.Dock = System.Windows.Forms.DockStyle.Top; + this.panel14.Location = new System.Drawing.Point(0, 134); + this.panel14.Name = "panel14"; + this.panel14.Size = new System.Drawing.Size(147, 15); + this.panel14.TabIndex = 10; + // + // panel11 + // + this.panel11.Controls.Add(this.classicLabel11); + this.panel11.Controls.Add(this.pictureBox7); + this.panel11.Dock = System.Windows.Forms.DockStyle.Top; + this.panel11.Location = new System.Drawing.Point(0, 66); + this.panel11.Name = "panel11"; + this.panel11.Size = new System.Drawing.Size(147, 68); + this.panel11.TabIndex = 3; + // + // classicLabel11 + // + this.classicLabel11.Dock = System.Windows.Forms.DockStyle.Top; + this.classicLabel11.Font = new System.Drawing.Font("Verdana", 9.25F); + this.classicLabel11.Location = new System.Drawing.Point(43, 0); + this.classicLabel11.Name = "classicLabel11"; + this.classicLabel11.Size = new System.Drawing.Size(104, 61); + this.classicLabel11.TabIndex = 12; + this.classicLabel11.Text = "Order it on CD or download it for free from this Web site."; + // + // pictureBox7 + // + this.pictureBox7.BackgroundImage = global::Histacom2.Properties.Resources.IE4Home_IE4CD; + this.pictureBox7.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.pictureBox7.Dock = System.Windows.Forms.DockStyle.Left; + this.pictureBox7.Location = new System.Drawing.Point(0, 0); + this.pictureBox7.Name = "pictureBox7"; + this.pictureBox7.Size = new System.Drawing.Size(43, 68); + this.pictureBox7.TabIndex = 0; + this.pictureBox7.TabStop = false; + // + // classicLabel10 + // + this.classicLabel10.Dock = System.Windows.Forms.DockStyle.Top; + this.classicLabel10.Font = new System.Drawing.Font("Verdana", 9.25F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline)))); + this.classicLabel10.ForeColor = System.Drawing.Color.Navy; + this.classicLabel10.Location = new System.Drawing.Point(0, 20); + this.classicLabel10.Name = "classicLabel10"; + this.classicLabel10.Size = new System.Drawing.Size(147, 46); + this.classicLabel10.TabIndex = 2; + this.classicLabel10.Text = "Get Internet Explorer 4.0 the Way You Want It:"; + // + // panel6 + // + this.panel6.Controls.Add(this.classicLabel25); + this.panel6.Controls.Add(this.classicLabel15); + this.panel6.Controls.Add(this.panel12); + this.panel6.Controls.Add(this.classicLabel9); + this.panel6.Controls.Add(this.classicLabel8); + this.panel6.Controls.Add(this.panel10); + this.panel6.Controls.Add(this.classicLabel7); + this.panel6.Controls.Add(this.classicLabel6); + this.panel6.Controls.Add(this.panel9); + this.panel6.Controls.Add(this.panel8); + this.panel6.Controls.Add(this.classicLabel3); + this.panel6.Controls.Add(this.classicLabel2); + this.panel6.Controls.Add(this.classicLabel1); + this.panel6.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel6.Location = new System.Drawing.Point(212, 90); + this.panel6.Name = "panel6"; + this.panel6.Padding = new System.Windows.Forms.Padding(0, 0, 15, 0); + this.panel6.Size = new System.Drawing.Size(585, 452); + this.panel6.TabIndex = 5; + // + // classicLabel15 + // + this.classicLabel15.Dock = System.Windows.Forms.DockStyle.Top; + this.classicLabel15.Font = new System.Drawing.Font("Verdana", 8.25F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.classicLabel15.ForeColor = System.Drawing.Color.Navy; + this.classicLabel15.Location = new System.Drawing.Point(0, 364); + this.classicLabel15.Name = "classicLabel15"; + this.classicLabel15.Size = new System.Drawing.Size(570, 14); + this.classicLabel15.TabIndex = 13; + this.classicLabel15.Text = "Previous Highlights"; + // + // panel12 + // + this.panel12.Dock = System.Windows.Forms.DockStyle.Top; + this.panel12.Location = new System.Drawing.Point(0, 349); + this.panel12.Name = "panel12"; + this.panel12.Size = new System.Drawing.Size(570, 15); + this.panel12.TabIndex = 12; + // + // classicLabel9 + // + this.classicLabel9.Dock = System.Windows.Forms.DockStyle.Top; + this.classicLabel9.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.classicLabel9.Location = new System.Drawing.Point(0, 308); + this.classicLabel9.Name = "classicLabel9"; + this.classicLabel9.Size = new System.Drawing.Size(570, 41); + this.classicLabel9.TabIndex = 11; + this.classicLabel9.Text = resources.GetString("classicLabel9.Text"); + // + // classicLabel8 + // + this.classicLabel8.Dock = System.Windows.Forms.DockStyle.Top; + this.classicLabel8.Font = new System.Drawing.Font("Verdana", 8.25F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.classicLabel8.ForeColor = System.Drawing.Color.Navy; + this.classicLabel8.Location = new System.Drawing.Point(0, 294); + this.classicLabel8.Name = "classicLabel8"; + this.classicLabel8.Size = new System.Drawing.Size(570, 14); + this.classicLabel8.TabIndex = 10; + this.classicLabel8.Text = "Internet Explorer 5 Beta Available for Download!"; + // + // panel10 + // + this.panel10.Dock = System.Windows.Forms.DockStyle.Top; + this.panel10.Location = new System.Drawing.Point(0, 279); + this.panel10.Name = "panel10"; + this.panel10.Size = new System.Drawing.Size(570, 15); + this.panel10.TabIndex = 9; + // + // classicLabel7 + // + this.classicLabel7.Dock = System.Windows.Forms.DockStyle.Top; + this.classicLabel7.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.classicLabel7.Location = new System.Drawing.Point(0, 238); + this.classicLabel7.Name = "classicLabel7"; + this.classicLabel7.Size = new System.Drawing.Size(570, 41); + this.classicLabel7.TabIndex = 8; + this.classicLabel7.Text = resources.GetString("classicLabel7.Text"); + // + // classicLabel6 + // + this.classicLabel6.Dock = System.Windows.Forms.DockStyle.Top; + this.classicLabel6.Font = new System.Drawing.Font("Verdana", 8.25F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.classicLabel6.ForeColor = System.Drawing.Color.Navy; + this.classicLabel6.Location = new System.Drawing.Point(0, 224); + this.classicLabel6.Name = "classicLabel6"; + this.classicLabel6.Size = new System.Drawing.Size(570, 14); + this.classicLabel6.TabIndex = 7; + this.classicLabel6.Text = "New Java Virtual Machine Available for Microsoft Internet Explorer"; + // + // panel9 + // + this.panel9.Dock = System.Windows.Forms.DockStyle.Top; + this.panel9.Location = new System.Drawing.Point(0, 209); + this.panel9.Name = "panel9"; + this.panel9.Size = new System.Drawing.Size(570, 15); + this.panel9.TabIndex = 6; + // + // panel8 + // + this.panel8.AutoSize = true; + this.panel8.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.panel8.Controls.Add(this.classicLabel5); + this.panel8.Controls.Add(this.classicLabel4); + this.panel8.Controls.Add(this.pictureBox6); + this.panel8.Dock = System.Windows.Forms.DockStyle.Top; + this.panel8.Location = new System.Drawing.Point(0, 88); + this.panel8.MinimumSize = new System.Drawing.Size(0, 121); + this.panel8.Name = "panel8"; + this.panel8.Padding = new System.Windows.Forms.Padding(0, 15, 0, 0); + this.panel8.Size = new System.Drawing.Size(570, 121); + this.panel8.TabIndex = 5; + // + // classicLabel5 + // + this.classicLabel5.Dock = System.Windows.Forms.DockStyle.Top; + this.classicLabel5.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.classicLabel5.Location = new System.Drawing.Point(120, 29); + this.classicLabel5.Name = "classicLabel5"; + this.classicLabel5.Size = new System.Drawing.Size(450, 68); + this.classicLabel5.TabIndex = 5; + this.classicLabel5.Text = resources.GetString("classicLabel5.Text"); + // + // classicLabel4 + // + this.classicLabel4.Dock = System.Windows.Forms.DockStyle.Top; + this.classicLabel4.Font = new System.Drawing.Font("Verdana", 8.25F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.classicLabel4.ForeColor = System.Drawing.Color.Navy; + this.classicLabel4.Location = new System.Drawing.Point(120, 15); + this.classicLabel4.Name = "classicLabel4"; + this.classicLabel4.Size = new System.Drawing.Size(450, 14); + this.classicLabel4.TabIndex = 3; + this.classicLabel4.Text = "Customers Report High Satisfaction with Internet Explorer 5 Beta"; + // + // pictureBox6 + // + this.pictureBox6.Dock = System.Windows.Forms.DockStyle.Left; + this.pictureBox6.Image = global::Histacom2.Properties.Resources.IE4Home_AboutIE5; + this.pictureBox6.Location = new System.Drawing.Point(0, 15); + this.pictureBox6.Name = "pictureBox6"; + this.pictureBox6.Size = new System.Drawing.Size(120, 106); + this.pictureBox6.TabIndex = 4; + this.pictureBox6.TabStop = false; + // + // classicLabel3 + // + this.classicLabel3.Dock = System.Windows.Forms.DockStyle.Top; + this.classicLabel3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.classicLabel3.Location = new System.Drawing.Point(0, 34); + this.classicLabel3.Name = "classicLabel3"; + this.classicLabel3.Size = new System.Drawing.Size(570, 54); + this.classicLabel3.TabIndex = 2; + this.classicLabel3.Text = resources.GetString("classicLabel3.Text"); + // + // classicLabel2 + // + this.classicLabel2.Dock = System.Windows.Forms.DockStyle.Top; + this.classicLabel2.Font = new System.Drawing.Font("Verdana", 8.25F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.classicLabel2.ForeColor = System.Drawing.Color.Navy; + this.classicLabel2.Location = new System.Drawing.Point(0, 20); + this.classicLabel2.Name = "classicLabel2"; + this.classicLabel2.Size = new System.Drawing.Size(570, 14); + this.classicLabel2.TabIndex = 1; + this.classicLabel2.Text = "Internet Explorer 5 Beta Released for HP-UX"; + // + // classicLabel1 + // + this.classicLabel1.Dock = System.Windows.Forms.DockStyle.Top; + this.classicLabel1.Font = new System.Drawing.Font("Verdana", 11.25F, System.Drawing.FontStyle.Bold); + this.classicLabel1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(156)))), ((int)(((byte)(255))))); + this.classicLabel1.Location = new System.Drawing.Point(0, 0); + this.classicLabel1.Name = "classicLabel1"; + this.classicLabel1.Size = new System.Drawing.Size(570, 20); + this.classicLabel1.TabIndex = 0; + this.classicLabel1.Text = "Highlights"; + // + // panel7 + // + this.panel7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(156)))), ((int)(((byte)(255))))); + this.panel7.Dock = System.Windows.Forms.DockStyle.Top; + this.panel7.Location = new System.Drawing.Point(0, 89); + this.panel7.Name = "panel7"; + this.panel7.Size = new System.Drawing.Size(959, 1); + this.panel7.TabIndex = 0; + // + // classicLabel25 + // + this.classicLabel25.Dock = System.Windows.Forms.DockStyle.Bottom; + this.classicLabel25.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.classicLabel25.Location = new System.Drawing.Point(0, 438); + this.classicLabel25.Name = "classicLabel25"; + this.classicLabel25.Size = new System.Drawing.Size(570, 14); + this.classicLabel25.TabIndex = 14; + this.classicLabel25.Text = "Last updated: Tuesday, November 03, 1998"; + // + // IE4HomePage + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScroll = true; + this.BackColor = System.Drawing.Color.White; + this.Controls.Add(this.panel6); + this.Controls.Add(this.panel5); + this.Controls.Add(this.panel4); + this.Controls.Add(this.panel7); + this.Controls.Add(this.panel3); + this.Controls.Add(this.panel2); + this.Controls.Add(this.panel1); + this.Name = "IE4HomePage"; + this.Size = new System.Drawing.Size(959, 542); + this.SizeChanged += new System.EventHandler(this.IE4HomePage_SizeChanged); + this.panel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit(); + this.panel3.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit(); + this.panel4.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox14)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox13)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox12)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox11)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox10)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox9)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox8)).EndInit(); + this.panel5.ResumeLayout(false); + this.panel15.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox15)).EndInit(); + this.panel11.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).EndInit(); + this.panel6.ResumeLayout(false); + this.panel6.PerformLayout(); + this.panel8.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.PictureBox pictureBox1; + private System.Windows.Forms.PictureBox pictureBox2; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.PictureBox pictureBox3; + private System.Windows.Forms.Panel panel3; + private System.Windows.Forms.PictureBox pictureBox4; + private System.Windows.Forms.PictureBox pictureBox5; + private System.Windows.Forms.Panel panel4; + private System.Windows.Forms.Panel panel5; + private System.Windows.Forms.Panel panel6; + private Engine.UI.ClassicLabel classicLabel1; + private System.Windows.Forms.Panel panel7; + private Engine.UI.ClassicLabel classicLabel2; + private Engine.UI.ClassicLabel classicLabel3; + private Engine.UI.ClassicLabel classicLabel4; + private System.Windows.Forms.Panel panel8; + private System.Windows.Forms.PictureBox pictureBox6; + private Engine.UI.ClassicLabel classicLabel5; + private System.Windows.Forms.Panel panel9; + private Engine.UI.ClassicLabel classicLabel7; + private Engine.UI.ClassicLabel classicLabel6; + private Engine.UI.ClassicLabel classicLabel8; + private System.Windows.Forms.Panel panel10; + private Engine.UI.ClassicLabel classicLabel9; + private Engine.UI.ClassicLabel classicLabel10; + private System.Windows.Forms.Panel panel11; + private System.Windows.Forms.PictureBox pictureBox7; + private Engine.UI.ClassicLabel classicLabel11; + private Engine.UI.ClassicLabel classicLabel12; + private System.Windows.Forms.PictureBox pictureBox8; + private Engine.UI.ClassicLabel classicLabel13; + private Engine.UI.ClassicLabel classicLabel14; + private System.Windows.Forms.PictureBox pictureBox9; + private Engine.UI.ClassicLabel classicLabel15; + private System.Windows.Forms.Panel panel12; + private System.Windows.Forms.PictureBox pictureBox11; + private Engine.UI.ClassicLabel classicLabel16; + private System.Windows.Forms.PictureBox pictureBox10; + private Engine.UI.ClassicLabel classicLabel22; + private Engine.UI.ClassicLabel classicLabel21; + private System.Windows.Forms.Panel panel13; + private Engine.UI.ClassicLabel classicLabel20; + private System.Windows.Forms.PictureBox pictureBox14; + private Engine.UI.ClassicLabel classicLabel19; + private System.Windows.Forms.PictureBox pictureBox13; + private Engine.UI.ClassicLabel classicLabel18; + private System.Windows.Forms.PictureBox pictureBox12; + private Engine.UI.ClassicLabel classicLabel17; + private Engine.UI.ClassicLabel classicLabel23; + private System.Windows.Forms.Panel panel14; + private System.Windows.Forms.Panel panel15; + private Engine.UI.ClassicLabel classicLabel24; + private System.Windows.Forms.PictureBox pictureBox15; + private Engine.UI.ClassicLabel classicLabel25; + } +} diff --git a/Histacom2/OS/Win98/Win98Apps/IE4Sites/IE4HomePage.cs b/Histacom2/OS/Win98/Win98Apps/IE4Sites/IE4HomePage.cs new file mode 100644 index 0000000..07402d1 --- /dev/null +++ b/Histacom2/OS/Win98/Win98Apps/IE4Sites/IE4HomePage.cs @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.Data; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace Histacom2.OS.Win98.Win98Apps.IE4Sites +{ + public partial class IE4HomePage : UserControl + { + public IE4HomePage() + { + InitializeComponent(); + } + + private void IE4HomePage_SizeChanged(object sender, EventArgs e) + { + classicLabel1.Invalidate(); + classicLabel2.Invalidate(); + classicLabel3.Invalidate(); + classicLabel4.Invalidate(); + classicLabel5.Invalidate(); + classicLabel6.Invalidate(); + classicLabel7.Invalidate(); + classicLabel8.Invalidate(); + classicLabel9.Invalidate(); + classicLabel25.Invalidate(); + } + } +} diff --git a/Histacom2/OS/Win98/Win98Apps/IE4Sites/IE4HomePage.resx b/Histacom2/OS/Win98/Win98Apps/IE4Sites/IE4HomePage.resx new file mode 100644 index 0000000..9979868 --- /dev/null +++ b/Histacom2/OS/Win98/Win98Apps/IE4Sites/IE4HomePage.resx @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + The newest Internet Explorer beta is designed to be simpler, more automated, and more flexible than any other browser. If you're an advanced user or corporate developer, or if you're curious about the next-generation browser, click the about link above! + + + Users of Microsoft Internet Explorer and developers now have the option to download an updated version of Microsoft's Java virtual machine, which also includes the Java Native Interface (JNI) technology for creating platform-specific applications in Java. + + + Over 93 percent of those responding to an online survey report that they are satisfied with Internet Explorer 5 Beta. Released for public testing one month ago, demand for the Internet Explorer 5 beta release has been more than double that for the Internet Explorer 4 public beta release over the same period, with approximately 600,000 downloads. + + + Internet Explorer 5 and Outlook Express Beta are now available for HP-UX computers. Joining the UNIX family of browsers, along with Internet Explorer 5 for Solaris computers released in November, the latest release is designed to make browsing the Web, and intranet, or an internal network easier than ever. + + \ No newline at end of file diff --git a/Histacom2/OS/Win98/Win98Apps/WinClassicIE4.Designer.cs b/Histacom2/OS/Win98/Win98Apps/WinClassicIE4.Designer.cs index 764d7a8..451ec0c 100644 --- a/Histacom2/OS/Win98/Win98Apps/WinClassicIE4.Designer.cs +++ b/Histacom2/OS/Win98/Win98Apps/WinClassicIE4.Designer.cs @@ -241,7 +241,7 @@ // // _addressbar // - this._addressbar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this._addressbar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this._addressbar.FormattingEnabled = true; this._addressbar.Location = new System.Drawing.Point(58, 2); @@ -529,7 +529,7 @@ this.ToolStripMenuItem20, this.ToolStripMenuItem21}); this.ToolStripMenuItem1.Name = "ToolStripMenuItem1"; - this.ToolStripMenuItem1.Size = new System.Drawing.Size(40, 20); + this.ToolStripMenuItem1.Size = new System.Drawing.Size(37, 20); this.ToolStripMenuItem1.Text = "File"; // // ToolStripMenuItem2 @@ -542,84 +542,84 @@ this.ToolStripMenuItem6, this.ToolStripMenuItem7}); this.ToolStripMenuItem2.Name = "ToolStripMenuItem2"; - this.ToolStripMenuItem2.Size = new System.Drawing.Size(239, 22); + this.ToolStripMenuItem2.Size = new System.Drawing.Size(221, 22); this.ToolStripMenuItem2.Text = "New"; // // ToolStripMenuItem3 // this.ToolStripMenuItem3.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem3.Name = "ToolStripMenuItem3"; - this.ToolStripMenuItem3.Size = new System.Drawing.Size(181, 22); + this.ToolStripMenuItem3.Size = new System.Drawing.Size(175, 22); this.ToolStripMenuItem3.Text = "Window Ctrl+N"; // // ToolStripMenuItem4 // this.ToolStripMenuItem4.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem4.Name = "ToolStripMenuItem4"; - this.ToolStripMenuItem4.Size = new System.Drawing.Size(181, 22); + this.ToolStripMenuItem4.Size = new System.Drawing.Size(175, 22); this.ToolStripMenuItem4.Text = "Message"; // // ToolStripMenuItem5 // this.ToolStripMenuItem5.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem5.Name = "ToolStripMenuItem5"; - this.ToolStripMenuItem5.Size = new System.Drawing.Size(181, 22); + this.ToolStripMenuItem5.Size = new System.Drawing.Size(175, 22); this.ToolStripMenuItem5.Text = "Post"; // // ToolStripMenuItem6 // this.ToolStripMenuItem6.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem6.Name = "ToolStripMenuItem6"; - this.ToolStripMenuItem6.Size = new System.Drawing.Size(181, 22); + this.ToolStripMenuItem6.Size = new System.Drawing.Size(175, 22); this.ToolStripMenuItem6.Text = "Contact"; // // ToolStripMenuItem7 // this.ToolStripMenuItem7.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem7.Name = "ToolStripMenuItem7"; - this.ToolStripMenuItem7.Size = new System.Drawing.Size(181, 22); + this.ToolStripMenuItem7.Size = new System.Drawing.Size(175, 22); this.ToolStripMenuItem7.Text = "Internet Call"; // // ToolStripMenuItem8 // this.ToolStripMenuItem8.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem8.Name = "ToolStripMenuItem8"; - this.ToolStripMenuItem8.Size = new System.Drawing.Size(239, 22); + this.ToolStripMenuItem8.Size = new System.Drawing.Size(221, 22); this.ToolStripMenuItem8.Text = "Open... Ctrl+O"; // // ToolStripMenuItem9 // this.ToolStripMenuItem9.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem9.Name = "ToolStripMenuItem9"; - this.ToolStripMenuItem9.Size = new System.Drawing.Size(239, 22); + this.ToolStripMenuItem9.Size = new System.Drawing.Size(221, 22); this.ToolStripMenuItem9.Text = "Edit with Windows Notepad"; // // ToolStripMenuItem10 // this.ToolStripMenuItem10.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem10.Name = "ToolStripMenuItem10"; - this.ToolStripMenuItem10.Size = new System.Drawing.Size(239, 22); + this.ToolStripMenuItem10.Size = new System.Drawing.Size(221, 22); this.ToolStripMenuItem10.Text = "Save Ctrl+S"; // // ToolStripMenuItem11 // this.ToolStripMenuItem11.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem11.Name = "ToolStripMenuItem11"; - this.ToolStripMenuItem11.Size = new System.Drawing.Size(239, 22); + this.ToolStripMenuItem11.Size = new System.Drawing.Size(221, 22); this.ToolStripMenuItem11.Text = "Save As..."; // // ToolStripMenuItem12 // this.ToolStripMenuItem12.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem12.Name = "ToolStripMenuItem12"; - this.ToolStripMenuItem12.Size = new System.Drawing.Size(239, 22); + this.ToolStripMenuItem12.Size = new System.Drawing.Size(221, 22); this.ToolStripMenuItem12.Text = "Print Setup..."; // // ToolStripMenuItem13 // this.ToolStripMenuItem13.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem13.Name = "ToolStripMenuItem13"; - this.ToolStripMenuItem13.Size = new System.Drawing.Size(239, 22); + this.ToolStripMenuItem13.Size = new System.Drawing.Size(221, 22); this.ToolStripMenuItem13.Text = "Print..."; // // ToolStripMenuItem14 @@ -630,56 +630,56 @@ this.ToolStripMenuItem16, this.ToolStripMenuItem17}); this.ToolStripMenuItem14.Name = "ToolStripMenuItem14"; - this.ToolStripMenuItem14.Size = new System.Drawing.Size(239, 22); + this.ToolStripMenuItem14.Size = new System.Drawing.Size(221, 22); this.ToolStripMenuItem14.Text = "Send"; // // ToolStripMenuItem15 // this.ToolStripMenuItem15.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem15.Name = "ToolStripMenuItem15"; - this.ToolStripMenuItem15.Size = new System.Drawing.Size(198, 22); + this.ToolStripMenuItem15.Size = new System.Drawing.Size(179, 22); this.ToolStripMenuItem15.Text = "Page by E-mail..."; // // ToolStripMenuItem16 // this.ToolStripMenuItem16.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem16.Name = "ToolStripMenuItem16"; - this.ToolStripMenuItem16.Size = new System.Drawing.Size(198, 22); + this.ToolStripMenuItem16.Size = new System.Drawing.Size(179, 22); this.ToolStripMenuItem16.Text = "Link by E-mail..."; // // ToolStripMenuItem17 // this.ToolStripMenuItem17.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem17.Name = "ToolStripMenuItem17"; - this.ToolStripMenuItem17.Size = new System.Drawing.Size(198, 22); + this.ToolStripMenuItem17.Size = new System.Drawing.Size(179, 22); this.ToolStripMenuItem17.Text = "Shortcut to Desktop"; // // ToolStripMenuItem18 // this.ToolStripMenuItem18.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem18.Name = "ToolStripMenuItem18"; - this.ToolStripMenuItem18.Size = new System.Drawing.Size(239, 22); + this.ToolStripMenuItem18.Size = new System.Drawing.Size(221, 22); this.ToolStripMenuItem18.Text = "Import and Export..."; // // ToolStripMenuItem19 // this.ToolStripMenuItem19.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem19.Name = "ToolStripMenuItem19"; - this.ToolStripMenuItem19.Size = new System.Drawing.Size(239, 22); + this.ToolStripMenuItem19.Size = new System.Drawing.Size(221, 22); this.ToolStripMenuItem19.Text = "Properties"; // // ToolStripMenuItem20 // this.ToolStripMenuItem20.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem20.Name = "ToolStripMenuItem20"; - this.ToolStripMenuItem20.Size = new System.Drawing.Size(239, 22); + this.ToolStripMenuItem20.Size = new System.Drawing.Size(221, 22); this.ToolStripMenuItem20.Text = "Work Offline"; // // ToolStripMenuItem21 // this.ToolStripMenuItem21.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem21.Name = "ToolStripMenuItem21"; - this.ToolStripMenuItem21.Size = new System.Drawing.Size(239, 22); + this.ToolStripMenuItem21.Size = new System.Drawing.Size(221, 22); this.ToolStripMenuItem21.Text = "Close"; // // ToolStripMenuItem22 @@ -691,42 +691,42 @@ this.ToolStripMenuItem26, this.ToolStripMenuItem27}); this.ToolStripMenuItem22.Name = "ToolStripMenuItem22"; - this.ToolStripMenuItem22.Size = new System.Drawing.Size(43, 20); + this.ToolStripMenuItem22.Size = new System.Drawing.Size(39, 20); this.ToolStripMenuItem22.Text = "Edit"; // // ToolStripMenuItem23 // this.ToolStripMenuItem23.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem23.Name = "ToolStripMenuItem23"; - this.ToolStripMenuItem23.Size = new System.Drawing.Size(237, 22); + this.ToolStripMenuItem23.Size = new System.Drawing.Size(221, 22); this.ToolStripMenuItem23.Text = "Cut Ctrl+X"; // // ToolStripMenuItem24 // this.ToolStripMenuItem24.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem24.Name = "ToolStripMenuItem24"; - this.ToolStripMenuItem24.Size = new System.Drawing.Size(237, 22); + this.ToolStripMenuItem24.Size = new System.Drawing.Size(221, 22); this.ToolStripMenuItem24.Text = "Copy Ctrl+C"; // // ToolStripMenuItem25 // this.ToolStripMenuItem25.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem25.Name = "ToolStripMenuItem25"; - this.ToolStripMenuItem25.Size = new System.Drawing.Size(237, 22); + this.ToolStripMenuItem25.Size = new System.Drawing.Size(221, 22); this.ToolStripMenuItem25.Text = "Paste Ctrl+V"; // // ToolStripMenuItem26 // this.ToolStripMenuItem26.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem26.Name = "ToolStripMenuItem26"; - this.ToolStripMenuItem26.Size = new System.Drawing.Size(237, 22); + this.ToolStripMenuItem26.Size = new System.Drawing.Size(221, 22); this.ToolStripMenuItem26.Text = "Select All Ctrl+A"; // // ToolStripMenuItem27 // this.ToolStripMenuItem27.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem27.Name = "ToolStripMenuItem27"; - this.ToolStripMenuItem27.Size = new System.Drawing.Size(237, 22); + this.ToolStripMenuItem27.Size = new System.Drawing.Size(221, 22); this.ToolStripMenuItem27.Text = "Find (on This Page)... Ctrl+F"; // // ToolStripMenuItem28 @@ -743,7 +743,7 @@ this.ToolStripMenuItem71, this.ToolStripMenuItem72}); this.ToolStripMenuItem28.Name = "ToolStripMenuItem28"; - this.ToolStripMenuItem28.Size = new System.Drawing.Size(47, 20); + this.ToolStripMenuItem28.Size = new System.Drawing.Size(44, 20); this.ToolStripMenuItem28.Text = "View"; // // ToolStripMenuItem29 @@ -756,49 +756,49 @@ this.ToolStripMenuItem33, this.ToolStripMenuItem34}); this.ToolStripMenuItem29.Name = "ToolStripMenuItem29"; - this.ToolStripMenuItem29.Size = new System.Drawing.Size(180, 22); + this.ToolStripMenuItem29.Size = new System.Drawing.Size(166, 22); this.ToolStripMenuItem29.Text = "Toolbars"; // // ToolStripMenuItem30 // this.ToolStripMenuItem30.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem30.Name = "ToolStripMenuItem30"; - this.ToolStripMenuItem30.Size = new System.Drawing.Size(183, 22); + this.ToolStripMenuItem30.Size = new System.Drawing.Size(165, 22); this.ToolStripMenuItem30.Text = "Standard Buttons"; // // ToolStripMenuItem31 // this.ToolStripMenuItem31.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem31.Name = "ToolStripMenuItem31"; - this.ToolStripMenuItem31.Size = new System.Drawing.Size(183, 22); + this.ToolStripMenuItem31.Size = new System.Drawing.Size(165, 22); this.ToolStripMenuItem31.Text = "Address Bar"; // // ToolStripMenuItem32 // this.ToolStripMenuItem32.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem32.Name = "ToolStripMenuItem32"; - this.ToolStripMenuItem32.Size = new System.Drawing.Size(183, 22); + this.ToolStripMenuItem32.Size = new System.Drawing.Size(165, 22); this.ToolStripMenuItem32.Text = "Links"; // // ToolStripMenuItem33 // this.ToolStripMenuItem33.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem33.Name = "ToolStripMenuItem33"; - this.ToolStripMenuItem33.Size = new System.Drawing.Size(183, 22); + this.ToolStripMenuItem33.Size = new System.Drawing.Size(165, 22); this.ToolStripMenuItem33.Text = "Radio"; // // ToolStripMenuItem34 // this.ToolStripMenuItem34.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem34.Name = "ToolStripMenuItem34"; - this.ToolStripMenuItem34.Size = new System.Drawing.Size(183, 22); + this.ToolStripMenuItem34.Size = new System.Drawing.Size(165, 22); this.ToolStripMenuItem34.Text = "Customize..."; // // ToolStripMenuItem35 // this.ToolStripMenuItem35.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem35.Name = "ToolStripMenuItem35"; - this.ToolStripMenuItem35.Size = new System.Drawing.Size(180, 22); + this.ToolStripMenuItem35.Size = new System.Drawing.Size(166, 22); this.ToolStripMenuItem35.Text = "Status Bar"; // // ToolStripMenuItem36 @@ -810,35 +810,35 @@ this.ToolStripMenuItem39, this.ToolStripMenuItem40}); this.ToolStripMenuItem36.Name = "ToolStripMenuItem36"; - this.ToolStripMenuItem36.Size = new System.Drawing.Size(180, 22); + this.ToolStripMenuItem36.Size = new System.Drawing.Size(166, 22); this.ToolStripMenuItem36.Text = "Explorer Bar"; // // ToolStripMenuItem37 // this.ToolStripMenuItem37.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem37.Name = "ToolStripMenuItem37"; - this.ToolStripMenuItem37.Size = new System.Drawing.Size(193, 22); + this.ToolStripMenuItem37.Size = new System.Drawing.Size(184, 22); this.ToolStripMenuItem37.Text = "Search Ctrl+E"; // // ToolStripMenuItem38 // this.ToolStripMenuItem38.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem38.Name = "ToolStripMenuItem38"; - this.ToolStripMenuItem38.Size = new System.Drawing.Size(193, 22); + this.ToolStripMenuItem38.Size = new System.Drawing.Size(184, 22); this.ToolStripMenuItem38.Text = "Favorites Ctrl+I"; // // ToolStripMenuItem39 // this.ToolStripMenuItem39.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem39.Name = "ToolStripMenuItem39"; - this.ToolStripMenuItem39.Size = new System.Drawing.Size(193, 22); + this.ToolStripMenuItem39.Size = new System.Drawing.Size(184, 22); this.ToolStripMenuItem39.Text = "History Ctrl+H"; // // ToolStripMenuItem40 // this.ToolStripMenuItem40.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem40.Name = "ToolStripMenuItem40"; - this.ToolStripMenuItem40.Size = new System.Drawing.Size(193, 22); + this.ToolStripMenuItem40.Size = new System.Drawing.Size(184, 22); this.ToolStripMenuItem40.Text = "Tip of the Day"; // // ToolStripMenuItem41 @@ -847,28 +847,28 @@ this.ToolStripMenuItem41.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.ToolStripMenuItem42}); this.ToolStripMenuItem41.Name = "ToolStripMenuItem41"; - this.ToolStripMenuItem41.Size = new System.Drawing.Size(180, 22); + this.ToolStripMenuItem41.Size = new System.Drawing.Size(166, 22); this.ToolStripMenuItem41.Text = "Go To"; // // ToolStripMenuItem42 // this.ToolStripMenuItem42.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem42.Name = "ToolStripMenuItem42"; - this.ToolStripMenuItem42.Size = new System.Drawing.Size(143, 22); + this.ToolStripMenuItem42.Size = new System.Drawing.Size(136, 22); this.ToolStripMenuItem42.Text = "Home Page"; // // ToolStripMenuItem43 // this.ToolStripMenuItem43.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem43.Name = "ToolStripMenuItem43"; - this.ToolStripMenuItem43.Size = new System.Drawing.Size(180, 22); + this.ToolStripMenuItem43.Size = new System.Drawing.Size(166, 22); this.ToolStripMenuItem43.Text = "Stop Esc"; // // ToolStripMenuItem44 // this.ToolStripMenuItem44.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem44.Name = "ToolStripMenuItem44"; - this.ToolStripMenuItem44.Size = new System.Drawing.Size(180, 22); + this.ToolStripMenuItem44.Size = new System.Drawing.Size(166, 22); this.ToolStripMenuItem44.Text = "Refresh F5"; // // ToolStripMenuItem45 @@ -881,42 +881,42 @@ this.ToolStripMenuItem49, this.ToolStripMenuItem50}); this.ToolStripMenuItem45.Name = "ToolStripMenuItem45"; - this.ToolStripMenuItem45.Size = new System.Drawing.Size(180, 22); + this.ToolStripMenuItem45.Size = new System.Drawing.Size(166, 22); this.ToolStripMenuItem45.Text = "Text Size"; // // ToolStripMenuItem46 // this.ToolStripMenuItem46.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem46.Name = "ToolStripMenuItem46"; - this.ToolStripMenuItem46.Size = new System.Drawing.Size(126, 22); + this.ToolStripMenuItem46.Size = new System.Drawing.Size(119, 22); this.ToolStripMenuItem46.Text = "Largest"; // // ToolStripMenuItem47 // this.ToolStripMenuItem47.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem47.Name = "ToolStripMenuItem47"; - this.ToolStripMenuItem47.Size = new System.Drawing.Size(126, 22); + this.ToolStripMenuItem47.Size = new System.Drawing.Size(119, 22); this.ToolStripMenuItem47.Text = "Larger"; // // ToolStripMenuItem48 // this.ToolStripMenuItem48.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem48.Name = "ToolStripMenuItem48"; - this.ToolStripMenuItem48.Size = new System.Drawing.Size(126, 22); + this.ToolStripMenuItem48.Size = new System.Drawing.Size(119, 22); this.ToolStripMenuItem48.Text = "Medium"; // // ToolStripMenuItem49 // this.ToolStripMenuItem49.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem49.Name = "ToolStripMenuItem49"; - this.ToolStripMenuItem49.Size = new System.Drawing.Size(126, 22); + this.ToolStripMenuItem49.Size = new System.Drawing.Size(119, 22); this.ToolStripMenuItem49.Text = "Smaller"; // // ToolStripMenuItem50 // this.ToolStripMenuItem50.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem50.Name = "ToolStripMenuItem50"; - this.ToolStripMenuItem50.Size = new System.Drawing.Size(126, 22); + this.ToolStripMenuItem50.Size = new System.Drawing.Size(119, 22); this.ToolStripMenuItem50.Text = "Smallest"; // // ToolStripMenuItem51 @@ -927,21 +927,21 @@ this.ToolStripMenuItem53, this.ToolStripMenuItem54}); this.ToolStripMenuItem51.Name = "ToolStripMenuItem51"; - this.ToolStripMenuItem51.Size = new System.Drawing.Size(180, 22); + this.ToolStripMenuItem51.Size = new System.Drawing.Size(166, 22); this.ToolStripMenuItem51.Text = "Encoding"; // // ToolStripMenuItem52 // this.ToolStripMenuItem52.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem52.Name = "ToolStripMenuItem52"; - this.ToolStripMenuItem52.Size = new System.Drawing.Size(249, 22); + this.ToolStripMenuItem52.Size = new System.Drawing.Size(230, 22); this.ToolStripMenuItem52.Text = "Auto-Select"; // // ToolStripMenuItem53 // this.ToolStripMenuItem53.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem53.Name = "ToolStripMenuItem53"; - this.ToolStripMenuItem53.Size = new System.Drawing.Size(249, 22); + this.ToolStripMenuItem53.Size = new System.Drawing.Size(230, 22); this.ToolStripMenuItem53.Text = "Western European (Windows)"; // // ToolStripMenuItem54 @@ -965,133 +965,133 @@ this.ToolStripMenuItem69, this.ToolStripMenuItem70}); this.ToolStripMenuItem54.Name = "ToolStripMenuItem54"; - this.ToolStripMenuItem54.Size = new System.Drawing.Size(249, 22); + this.ToolStripMenuItem54.Size = new System.Drawing.Size(230, 22); this.ToolStripMenuItem54.Text = "More"; // // ToolStripMenuItem55 // this.ToolStripMenuItem55.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem55.Name = "ToolStripMenuItem55"; - this.ToolStripMenuItem55.Size = new System.Drawing.Size(216, 22); + this.ToolStripMenuItem55.Size = new System.Drawing.Size(199, 22); this.ToolStripMenuItem55.Text = "Arabic"; // // ToolStripMenuItem56 // this.ToolStripMenuItem56.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem56.Name = "ToolStripMenuItem56"; - this.ToolStripMenuItem56.Size = new System.Drawing.Size(216, 22); + this.ToolStripMenuItem56.Size = new System.Drawing.Size(199, 22); this.ToolStripMenuItem56.Text = "Baltic"; // // ToolStripMenuItem57 // this.ToolStripMenuItem57.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem57.Name = "ToolStripMenuItem57"; - this.ToolStripMenuItem57.Size = new System.Drawing.Size(216, 22); + this.ToolStripMenuItem57.Size = new System.Drawing.Size(199, 22); this.ToolStripMenuItem57.Text = "Central European"; // // ToolStripMenuItem58 // this.ToolStripMenuItem58.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem58.Name = "ToolStripMenuItem58"; - this.ToolStripMenuItem58.Size = new System.Drawing.Size(216, 22); + this.ToolStripMenuItem58.Size = new System.Drawing.Size(199, 22); this.ToolStripMenuItem58.Text = "Chinese Simplified"; // // ToolStripMenuItem59 // this.ToolStripMenuItem59.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem59.Name = "ToolStripMenuItem59"; - this.ToolStripMenuItem59.Size = new System.Drawing.Size(216, 22); + this.ToolStripMenuItem59.Size = new System.Drawing.Size(199, 22); this.ToolStripMenuItem59.Text = "Chinese Traditional"; // // ToolStripMenuItem60 // this.ToolStripMenuItem60.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem60.Name = "ToolStripMenuItem60"; - this.ToolStripMenuItem60.Size = new System.Drawing.Size(216, 22); + this.ToolStripMenuItem60.Size = new System.Drawing.Size(199, 22); this.ToolStripMenuItem60.Text = "Cyrillic"; // // ToolStripMenuItem61 // this.ToolStripMenuItem61.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem61.Name = "ToolStripMenuItem61"; - this.ToolStripMenuItem61.Size = new System.Drawing.Size(216, 22); + this.ToolStripMenuItem61.Size = new System.Drawing.Size(199, 22); this.ToolStripMenuItem61.Text = "Greek"; // // ToolStripMenuItem62 // this.ToolStripMenuItem62.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem62.Name = "ToolStripMenuItem62"; - this.ToolStripMenuItem62.Size = new System.Drawing.Size(216, 22); + this.ToolStripMenuItem62.Size = new System.Drawing.Size(199, 22); this.ToolStripMenuItem62.Text = "Hebrew"; // // ToolStripMenuItem63 // this.ToolStripMenuItem63.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem63.Name = "ToolStripMenuItem63"; - this.ToolStripMenuItem63.Size = new System.Drawing.Size(216, 22); + this.ToolStripMenuItem63.Size = new System.Drawing.Size(199, 22); this.ToolStripMenuItem63.Text = "Japanese"; // // ToolStripMenuItem64 // this.ToolStripMenuItem64.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem64.Name = "ToolStripMenuItem64"; - this.ToolStripMenuItem64.Size = new System.Drawing.Size(216, 22); + this.ToolStripMenuItem64.Size = new System.Drawing.Size(199, 22); this.ToolStripMenuItem64.Text = "Korean"; // // ToolStripMenuItem65 // this.ToolStripMenuItem65.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem65.Name = "ToolStripMenuItem65"; - this.ToolStripMenuItem65.Size = new System.Drawing.Size(216, 22); + this.ToolStripMenuItem65.Size = new System.Drawing.Size(199, 22); this.ToolStripMenuItem65.Text = "Thai"; // // ToolStripMenuItem66 // this.ToolStripMenuItem66.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem66.Name = "ToolStripMenuItem66"; - this.ToolStripMenuItem66.Size = new System.Drawing.Size(216, 22); + this.ToolStripMenuItem66.Size = new System.Drawing.Size(199, 22); this.ToolStripMenuItem66.Text = "Turkish"; // // ToolStripMenuItem67 // this.ToolStripMenuItem67.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem67.Name = "ToolStripMenuItem67"; - this.ToolStripMenuItem67.Size = new System.Drawing.Size(216, 22); + this.ToolStripMenuItem67.Size = new System.Drawing.Size(199, 22); this.ToolStripMenuItem67.Text = "Unicode (UTF-8)"; // // ToolStripMenuItem68 // this.ToolStripMenuItem68.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem68.Name = "ToolStripMenuItem68"; - this.ToolStripMenuItem68.Size = new System.Drawing.Size(216, 22); + this.ToolStripMenuItem68.Size = new System.Drawing.Size(199, 22); this.ToolStripMenuItem68.Text = "User Defined"; // // ToolStripMenuItem69 // this.ToolStripMenuItem69.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem69.Name = "ToolStripMenuItem69"; - this.ToolStripMenuItem69.Size = new System.Drawing.Size(216, 22); + this.ToolStripMenuItem69.Size = new System.Drawing.Size(199, 22); this.ToolStripMenuItem69.Text = "Vietnamese"; // // ToolStripMenuItem70 // this.ToolStripMenuItem70.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem70.Name = "ToolStripMenuItem70"; - this.ToolStripMenuItem70.Size = new System.Drawing.Size(216, 22); + this.ToolStripMenuItem70.Size = new System.Drawing.Size(199, 22); this.ToolStripMenuItem70.Text = "Western European (ISO)"; // // ToolStripMenuItem71 // this.ToolStripMenuItem71.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem71.Name = "ToolStripMenuItem71"; - this.ToolStripMenuItem71.Size = new System.Drawing.Size(180, 22); + this.ToolStripMenuItem71.Size = new System.Drawing.Size(166, 22); this.ToolStripMenuItem71.Text = "Source"; // // ToolStripMenuItem72 // this.ToolStripMenuItem72.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem72.Name = "ToolStripMenuItem72"; - this.ToolStripMenuItem72.Size = new System.Drawing.Size(180, 22); + this.ToolStripMenuItem72.Size = new System.Drawing.Size(166, 22); this.ToolStripMenuItem72.Text = "Full Screen F11"; // // ToolStripMenuItem78 @@ -1102,7 +1102,7 @@ this.ToolStripMenuItem86, this.ToolStripMenuItem87}); this.ToolStripMenuItem78.Name = "ToolStripMenuItem78"; - this.ToolStripMenuItem78.Size = new System.Drawing.Size(36, 20); + this.ToolStripMenuItem78.Size = new System.Drawing.Size(34, 20); this.ToolStripMenuItem78.Text = "Go"; // // ToolStripMenuItem79 @@ -1115,63 +1115,63 @@ this.ToolStripMenuItem83, this.ToolStripMenuItem84}); this.ToolStripMenuItem79.Name = "ToolStripMenuItem79"; - this.ToolStripMenuItem79.Size = new System.Drawing.Size(191, 22); + this.ToolStripMenuItem79.Size = new System.Drawing.Size(175, 22); this.ToolStripMenuItem79.Text = "Mail and News"; // // ToolStripMenuItem80 // this.ToolStripMenuItem80.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem80.Name = "ToolStripMenuItem80"; - this.ToolStripMenuItem80.Size = new System.Drawing.Size(165, 22); + this.ToolStripMenuItem80.Size = new System.Drawing.Size(156, 22); this.ToolStripMenuItem80.Text = "Read Mail"; // // ToolStripMenuItem81 // this.ToolStripMenuItem81.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem81.Name = "ToolStripMenuItem81"; - this.ToolStripMenuItem81.Size = new System.Drawing.Size(165, 22); + this.ToolStripMenuItem81.Size = new System.Drawing.Size(156, 22); this.ToolStripMenuItem81.Text = "New Message..."; // // ToolStripMenuItem82 // this.ToolStripMenuItem82.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem82.Name = "ToolStripMenuItem82"; - this.ToolStripMenuItem82.Size = new System.Drawing.Size(165, 22); + this.ToolStripMenuItem82.Size = new System.Drawing.Size(156, 22); this.ToolStripMenuItem82.Text = "Send a Link..."; // // ToolStripMenuItem83 // this.ToolStripMenuItem83.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem83.Name = "ToolStripMenuItem83"; - this.ToolStripMenuItem83.Size = new System.Drawing.Size(165, 22); + this.ToolStripMenuItem83.Size = new System.Drawing.Size(156, 22); this.ToolStripMenuItem83.Text = "Send Page..."; // // ToolStripMenuItem84 // this.ToolStripMenuItem84.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem84.Name = "ToolStripMenuItem84"; - this.ToolStripMenuItem84.Size = new System.Drawing.Size(165, 22); + this.ToolStripMenuItem84.Size = new System.Drawing.Size(156, 22); this.ToolStripMenuItem84.Text = "Read News"; // // ToolStripMenuItem85 // this.ToolStripMenuItem85.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem85.Name = "ToolStripMenuItem85"; - this.ToolStripMenuItem85.Size = new System.Drawing.Size(191, 22); + this.ToolStripMenuItem85.Size = new System.Drawing.Size(175, 22); this.ToolStripMenuItem85.Text = "Windows Update"; // // ToolStripMenuItem86 // this.ToolStripMenuItem86.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem86.Name = "ToolStripMenuItem86"; - this.ToolStripMenuItem86.Size = new System.Drawing.Size(191, 22); + this.ToolStripMenuItem86.Size = new System.Drawing.Size(175, 22); this.ToolStripMenuItem86.Text = "Show Related Links"; // // ToolStripMenuItem87 // this.ToolStripMenuItem87.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem87.Name = "ToolStripMenuItem87"; - this.ToolStripMenuItem87.Size = new System.Drawing.Size(191, 22); + this.ToolStripMenuItem87.Size = new System.Drawing.Size(175, 22); this.ToolStripMenuItem87.Text = "Internet Options..."; // // ToolStripMenuItem73 @@ -1181,21 +1181,21 @@ this.ToolStripMenuItem75, this.ToolStripMenuItem76}); this.ToolStripMenuItem73.Name = "ToolStripMenuItem73"; - this.ToolStripMenuItem73.Size = new System.Drawing.Size(76, 20); + this.ToolStripMenuItem73.Size = new System.Drawing.Size(66, 20); this.ToolStripMenuItem73.Text = "Favorites"; // // ToolStripMenuItem74 // this.ToolStripMenuItem74.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem74.Name = "ToolStripMenuItem74"; - this.ToolStripMenuItem74.Size = new System.Drawing.Size(197, 22); + this.ToolStripMenuItem74.Size = new System.Drawing.Size(180, 22); this.ToolStripMenuItem74.Text = "Add to Favorites..."; // // ToolStripMenuItem75 // this.ToolStripMenuItem75.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem75.Name = "ToolStripMenuItem75"; - this.ToolStripMenuItem75.Size = new System.Drawing.Size(197, 22); + this.ToolStripMenuItem75.Size = new System.Drawing.Size(180, 22); this.ToolStripMenuItem75.Text = "Organize Favorites..."; // // ToolStripMenuItem76 @@ -1204,14 +1204,14 @@ this.ToolStripMenuItem76.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.ToolStripMenuItem77}); this.ToolStripMenuItem76.Name = "ToolStripMenuItem76"; - this.ToolStripMenuItem76.Size = new System.Drawing.Size(197, 22); + this.ToolStripMenuItem76.Size = new System.Drawing.Size(180, 22); this.ToolStripMenuItem76.Text = "Links"; // // ToolStripMenuItem77 // this.ToolStripMenuItem77.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem77.Name = "ToolStripMenuItem77"; - this.ToolStripMenuItem77.Size = new System.Drawing.Size(111, 22); + this.ToolStripMenuItem77.Size = new System.Drawing.Size(109, 22); this.ToolStripMenuItem77.Text = "(none)"; // // ToolStripMenuItem88 @@ -1225,65 +1225,66 @@ this.ToolStripMenuItem94, this.ToolStripMenuItem95}); this.ToolStripMenuItem88.Name = "ToolStripMenuItem88"; - this.ToolStripMenuItem88.Size = new System.Drawing.Size(46, 20); + this.ToolStripMenuItem88.Size = new System.Drawing.Size(44, 20); this.ToolStripMenuItem88.Text = "Help"; // // ToolStripMenuItem89 // this.ToolStripMenuItem89.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem89.Name = "ToolStripMenuItem89"; - this.ToolStripMenuItem89.Size = new System.Drawing.Size(217, 22); + this.ToolStripMenuItem89.Size = new System.Drawing.Size(196, 22); this.ToolStripMenuItem89.Text = "Contects and Index"; // // ToolStripMenuItem90 // this.ToolStripMenuItem90.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem90.Name = "ToolStripMenuItem90"; - this.ToolStripMenuItem90.Size = new System.Drawing.Size(217, 22); + this.ToolStripMenuItem90.Size = new System.Drawing.Size(196, 22); this.ToolStripMenuItem90.Text = "Tip of the Day"; // // ToolStripMenuItem91 // this.ToolStripMenuItem91.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem91.Name = "ToolStripMenuItem91"; - this.ToolStripMenuItem91.Size = new System.Drawing.Size(217, 22); + this.ToolStripMenuItem91.Size = new System.Drawing.Size(196, 22); this.ToolStripMenuItem91.Text = "For Netscape Users"; // // ToolStripMenuItem92 // this.ToolStripMenuItem92.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem92.Name = "ToolStripMenuItem92"; - this.ToolStripMenuItem92.Size = new System.Drawing.Size(217, 22); + this.ToolStripMenuItem92.Size = new System.Drawing.Size(196, 22); this.ToolStripMenuItem92.Text = "Tour"; // // ToolStripMenuItem93 // this.ToolStripMenuItem93.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem93.Name = "ToolStripMenuItem93"; - this.ToolStripMenuItem93.Size = new System.Drawing.Size(217, 22); + this.ToolStripMenuItem93.Size = new System.Drawing.Size(196, 22); this.ToolStripMenuItem93.Text = "Online Support"; // // ToolStripMenuItem94 // this.ToolStripMenuItem94.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem94.Name = "ToolStripMenuItem94"; - this.ToolStripMenuItem94.Size = new System.Drawing.Size(217, 22); + this.ToolStripMenuItem94.Size = new System.Drawing.Size(196, 22); this.ToolStripMenuItem94.Text = "About Internet Explorer"; // // ToolStripMenuItem95 // this.ToolStripMenuItem95.BackColor = System.Drawing.Color.Silver; this.ToolStripMenuItem95.Name = "ToolStripMenuItem95"; - this.ToolStripMenuItem95.Size = new System.Drawing.Size(217, 22); + this.ToolStripMenuItem95.Size = new System.Drawing.Size(196, 22); this.ToolStripMenuItem95.Text = "Send Feedback"; // // _browsingArea // + this._browsingArea.AutoScroll = true; this._browsingArea.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this._browsingArea.Dock = System.Windows.Forms.DockStyle.Fill; this._browsingArea.Location = new System.Drawing.Point(0, 102); this._browsingArea.Name = "_browsingArea"; - this._browsingArea.Size = new System.Drawing.Size(959, 492); + this._browsingArea.Size = new System.Drawing.Size(959, 542); this._browsingArea.TabIndex = 17; // // pictureBox4 @@ -1317,7 +1318,7 @@ this.Controls.Add(this.Panel1); this.Controls.Add(this.MenuStrip3); this.Name = "WinClassicIE4"; - this.Size = new System.Drawing.Size(959, 594); + this.Size = new System.Drawing.Size(959, 644); this.Load += new System.EventHandler(this.TempIE4_Load); this.Panel14.ResumeLayout(false); this.Panel14.PerformLayout(); diff --git a/Histacom2/OS/Win98/Win98Apps/WinClassicIE4.cs b/Histacom2/OS/Win98/Win98Apps/WinClassicIE4.cs index aa3b0b0..e731303 100644 --- a/Histacom2/OS/Win98/Win98Apps/WinClassicIE4.cs +++ b/Histacom2/OS/Win98/Win98Apps/WinClassicIE4.cs @@ -29,9 +29,10 @@ namespace Histacom2.OS.Win98.Win98Apps switch (url) { - /*case "www.microsoft.com/windows/ie/default.htm": - uc = new IE4Start(); + case "www.microsoft.com/windows/ie/default.htm": + uc = new IE4HomePage(); break; + /* case "www.google.com": uc = new GoogleHome(); break; diff --git a/Histacom2/OS/Win98/Win98Apps/WinClassicIE4.resx b/Histacom2/OS/Win98/Win98Apps/WinClassicIE4.resx new file mode 100644 index 0000000..5039d37 --- /dev/null +++ b/Histacom2/OS/Win98/Win98Apps/WinClassicIE4.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/Properties/Resources.resx b/Histacom2/Properties/Resources.resx index adf568b..c4c57d1 100644 --- a/Histacom2/Properties/Resources.resx +++ b/Histacom2/Properties/Resources.resx @@ -127,7 +127,7 @@ ..\resources\winclassic\winclassicmsn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - + ..\Resources\IE4\start.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -205,9 +205,6 @@ ..\resources\lemon's lcd.ttf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\GuessTheNumber\GTN95_RestartClicked.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\WinClassic\Win95Error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -241,9 +238,6 @@ ..\Resources\termMax.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\GuessTheNumber\GTN95_CheckClicked.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\wordpad_open.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -277,9 +271,6 @@ ..\resources\winclassic\winclassichelp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\GuessTheNumber\GTN95_Restart.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\IE3\IE3_ForwardHover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -595,9 +586,6 @@ ..\Resources\win95_welcometip.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\GuessTheNumber\GTN95_Check.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\win95_splitter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -1930,4 +1918,37 @@ ..\Resources\Win95Error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\IE4\IE4Home_AboutIE5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\IE4\IE4Home_HDots.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\IE4\IE4Home_IE4CD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\IE4\IE4Home_MSBG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\IE4\IE4Home_MSHome.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\IE4\IE4Home_MSLogo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\IE4\IE4Home_SecUpdate.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\IE4\IE4Home_WinTechBG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\IE4\IE4Home_WinTechHome.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\IE4\IE4Home_WinTechIE.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\IE4\IE4Home_WinTechLogo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/Histacom2/Properties/Resources1.Designer.cs b/Histacom2/Properties/Resources1.Designer.cs index 675f5bb..a43041c 100644 --- a/Histacom2/Properties/Resources1.Designer.cs +++ b/Histacom2/Properties/Resources1.Designer.cs @@ -19,7 +19,7 @@ namespace Histacom2.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class Resources { @@ -204,26 +204,6 @@ namespace Histacom2.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap GTN95_Check { - get { - object obj = ResourceManager.GetObject("GTN95_Check", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap GTN95_CheckClicked { - get { - object obj = ResourceManager.GetObject("GTN95_CheckClicked", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -264,26 +244,6 @@ namespace Histacom2.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap GTN95_Restart { - get { - object obj = ResourceManager.GetObject("GTN95_Restart", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap GTN95_RestartClicked { - get { - object obj = ResourceManager.GetObject("GTN95_RestartClicked", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -384,6 +344,16 @@ namespace Histacom2.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap IE3_Start { + get { + object obj = ResourceManager.GetObject("IE3_Start", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -574,6 +544,116 @@ namespace Histacom2.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap IE4Home_AboutIE5 { + get { + object obj = ResourceManager.GetObject("IE4Home_AboutIE5", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap IE4Home_HDots { + get { + object obj = ResourceManager.GetObject("IE4Home_HDots", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap IE4Home_IE4CD { + get { + object obj = ResourceManager.GetObject("IE4Home_IE4CD", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap IE4Home_MSBG { + get { + object obj = ResourceManager.GetObject("IE4Home_MSBG", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap IE4Home_MSHome { + get { + object obj = ResourceManager.GetObject("IE4Home_MSHome", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap IE4Home_MSLogo { + get { + object obj = ResourceManager.GetObject("IE4Home_MSLogo", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap IE4Home_SecUpdate { + get { + object obj = ResourceManager.GetObject("IE4Home_SecUpdate", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap IE4Home_WinTechBG { + get { + object obj = ResourceManager.GetObject("IE4Home_WinTechBG", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap IE4Home_WinTechHome { + get { + object obj = ResourceManager.GetObject("IE4Home_WinTechHome", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap IE4Home_WinTechIE { + get { + object obj = ResourceManager.GetObject("IE4Home_WinTechIE", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap IE4Home_WinTechLogo { + get { + object obj = ResourceManager.GetObject("IE4Home_WinTechLogo", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -803,16 +883,6 @@ namespace Histacom2.Properties { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap start { - get { - object obj = ResourceManager.GetObject("start", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/Histacom2/Resources/IE4/IE4Home_AboutIE5.png b/Histacom2/Resources/IE4/IE4Home_AboutIE5.png new file mode 100644 index 0000000..243afce Binary files /dev/null and b/Histacom2/Resources/IE4/IE4Home_AboutIE5.png differ diff --git a/Histacom2/Resources/IE4/IE4Home_HDots.png b/Histacom2/Resources/IE4/IE4Home_HDots.png new file mode 100644 index 0000000..27b5128 Binary files /dev/null and b/Histacom2/Resources/IE4/IE4Home_HDots.png differ diff --git a/Histacom2/Resources/IE4/IE4Home_IE4CD.png b/Histacom2/Resources/IE4/IE4Home_IE4CD.png new file mode 100644 index 0000000..84f55b6 Binary files /dev/null and b/Histacom2/Resources/IE4/IE4Home_IE4CD.png differ diff --git a/Histacom2/Resources/IE4/IE4Home_MSBG.png b/Histacom2/Resources/IE4/IE4Home_MSBG.png new file mode 100644 index 0000000..ffc353f Binary files /dev/null and b/Histacom2/Resources/IE4/IE4Home_MSBG.png differ diff --git a/Histacom2/Resources/IE4/IE4Home_MSHome.png b/Histacom2/Resources/IE4/IE4Home_MSHome.png new file mode 100644 index 0000000..2f15b49 Binary files /dev/null and b/Histacom2/Resources/IE4/IE4Home_MSHome.png differ diff --git a/Histacom2/Resources/IE4/IE4Home_MSLogo.png b/Histacom2/Resources/IE4/IE4Home_MSLogo.png new file mode 100644 index 0000000..0b5733f Binary files /dev/null and b/Histacom2/Resources/IE4/IE4Home_MSLogo.png differ diff --git a/Histacom2/Resources/IE4/IE4Home_SecUpdate.png b/Histacom2/Resources/IE4/IE4Home_SecUpdate.png new file mode 100644 index 0000000..b8c0b23 Binary files /dev/null and b/Histacom2/Resources/IE4/IE4Home_SecUpdate.png differ diff --git a/Histacom2/Resources/IE4/IE4Home_WinTechBG.png b/Histacom2/Resources/IE4/IE4Home_WinTechBG.png new file mode 100644 index 0000000..814fc67 Binary files /dev/null and b/Histacom2/Resources/IE4/IE4Home_WinTechBG.png differ diff --git a/Histacom2/Resources/IE4/IE4Home_WinTechHome.png b/Histacom2/Resources/IE4/IE4Home_WinTechHome.png new file mode 100644 index 0000000..0e38b4d Binary files /dev/null and b/Histacom2/Resources/IE4/IE4Home_WinTechHome.png differ diff --git a/Histacom2/Resources/IE4/IE4Home_WinTechIE.png b/Histacom2/Resources/IE4/IE4Home_WinTechIE.png new file mode 100644 index 0000000..eed79ed Binary files /dev/null and b/Histacom2/Resources/IE4/IE4Home_WinTechIE.png differ diff --git a/Histacom2/Resources/IE4/IE4Home_WinTechLogo.png b/Histacom2/Resources/IE4/IE4Home_WinTechLogo.png new file mode 100644 index 0000000..f4835dc Binary files /dev/null and b/Histacom2/Resources/IE4/IE4Home_WinTechLogo.png differ diff --git a/Histacom2/Resources/IE4/start.png b/Histacom2/Resources/IE4/start.png index 225659c..8cf033f 100644 Binary files a/Histacom2/Resources/IE4/start.png and b/Histacom2/Resources/IE4/start.png differ -- cgit v1.2.3 From 1733261571c06226b44374ef658de0f062cef08b Mon Sep 17 00:00:00 2001 From: lempamo Date: Wed, 20 Sep 2017 00:37:10 -0400 Subject: partial 1999 12padams site --- Histacom2.Engine/UI/ClassicButton.cs | 4 +- Histacom2/Histacom2.csproj | 9 + .../Win98Apps/IE4Sites/12padams1999.Designer.cs | 287 +++++++++++++++++++++ .../OS/Win98/Win98Apps/IE4Sites/12padams1999.cs | 20 ++ .../OS/Win98/Win98Apps/IE4Sites/12padams1999.resx | 120 +++++++++ .../Win98Apps/IE4Sites/IE4HomePage.Designer.cs | 21 +- .../OS/Win98/Win98Apps/IE4Sites/IE4HomePage.cs | 6 + Histacom2/OS/Win98/Win98Apps/WinClassicIE4.cs | 6 +- 8 files changed, 465 insertions(+), 8 deletions(-) create mode 100644 Histacom2/OS/Win98/Win98Apps/IE4Sites/12padams1999.Designer.cs create mode 100644 Histacom2/OS/Win98/Win98Apps/IE4Sites/12padams1999.cs create mode 100644 Histacom2/OS/Win98/Win98Apps/IE4Sites/12padams1999.resx (limited to 'Histacom2.Engine/UI') diff --git a/Histacom2.Engine/UI/ClassicButton.cs b/Histacom2.Engine/UI/ClassicButton.cs index 9b1db72..027d198 100644 --- a/Histacom2.Engine/UI/ClassicButton.cs +++ b/Histacom2.Engine/UI/ClassicButton.cs @@ -28,6 +28,7 @@ namespace Histacom2.Engine.UI } } + public bool AdaptBackColorWithTheme = true; public bool AdaptForeColorWithTheme = true; public bool AdaptFontWithTheme = true; @@ -48,8 +49,7 @@ namespace Histacom2.Engine.UI { base.OnPaint(e); - if (SaveSystem.currentTheme != null) BackColor = SaveSystem.currentTheme.threeDObjectsColor; - else BackColor = Color.Silver; + if (SaveSystem.currentTheme != null && AdaptBackColorWithTheme) BackColor = SaveSystem.currentTheme.threeDObjectsColor; if (AdaptForeColorWithTheme) { diff --git a/Histacom2/Histacom2.csproj b/Histacom2/Histacom2.csproj index af9ea2c..0064576 100644 --- a/Histacom2/Histacom2.csproj +++ b/Histacom2/Histacom2.csproj @@ -268,6 +268,12 @@ Win98.cs + + UserControl + + + 12padams1999.cs + UserControl @@ -464,6 +470,9 @@ Win98.cs Designer + + 12padams1999.cs + IE4HomePage.cs diff --git a/Histacom2/OS/Win98/Win98Apps/IE4Sites/12padams1999.Designer.cs b/Histacom2/OS/Win98/Win98Apps/IE4Sites/12padams1999.Designer.cs new file mode 100644 index 0000000..aeba4df --- /dev/null +++ b/Histacom2/OS/Win98/Win98Apps/IE4Sites/12padams1999.Designer.cs @@ -0,0 +1,287 @@ +namespace Histacom2.OS.Win98.Win98Apps.IE4Sites +{ + partial class _12padams1999 + { + /// + /// 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.classicLabel1 = new Histacom2.Engine.UI.ClassicLabel(); + this.classicLabel2 = new Histacom2.Engine.UI.ClassicLabel(); + this.panel1 = new System.Windows.Forms.Panel(); + this.panel2 = new System.Windows.Forms.Panel(); + this.classicLabel3 = new Histacom2.Engine.UI.ClassicLabel(); + this.panel3 = new System.Windows.Forms.Panel(); + this.panel4 = new System.Windows.Forms.Panel(); + this.classicLabel4 = new Histacom2.Engine.UI.ClassicLabel(); + this.panel5 = new System.Windows.Forms.Panel(); + this.panel6 = new System.Windows.Forms.Panel(); + this.classicLabel5 = new Histacom2.Engine.UI.ClassicLabel(); + this.panel7 = new System.Windows.Forms.Panel(); + this.panel8 = new System.Windows.Forms.Panel(); + this.classicLabel6 = new Histacom2.Engine.UI.ClassicLabel(); + this.panel9 = new System.Windows.Forms.Panel(); + this.panel10 = new System.Windows.Forms.Panel(); + this.classicLabel7 = new Histacom2.Engine.UI.ClassicLabel(); + this.panel1.SuspendLayout(); + this.panel2.SuspendLayout(); + this.panel3.SuspendLayout(); + this.panel4.SuspendLayout(); + this.panel5.SuspendLayout(); + this.panel6.SuspendLayout(); + this.panel7.SuspendLayout(); + this.panel8.SuspendLayout(); + this.panel9.SuspendLayout(); + this.panel10.SuspendLayout(); + this.SuspendLayout(); + // + // classicLabel1 + // + this.classicLabel1.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.classicLabel1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.classicLabel1.Location = new System.Drawing.Point(353, 12); + this.classicLabel1.Name = "classicLabel1"; + this.classicLabel1.Size = new System.Drawing.Size(271, 16); + this.classicLabel1.TabIndex = 0; + this.classicLabel1.Text = "Welcome to the official 12padams website!"; + // + // classicLabel2 + // + this.classicLabel2.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.classicLabel2.Location = new System.Drawing.Point(367, 34); + this.classicLabel2.Name = "classicLabel2"; + this.classicLabel2.Size = new System.Drawing.Size(250, 13); + this.classicLabel2.TabIndex = 1; + this.classicLabel2.Text = "The best software for your Windows 98 computer"; + // + // panel1 + // + this.panel1.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.panel1.BackColor = System.Drawing.Color.Lime; + this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel1.Controls.Add(this.panel2); + this.panel1.Location = new System.Drawing.Point(110, 90); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(214, 209); + this.panel1.TabIndex = 2; + // + // panel2 + // + this.panel2.BackColor = System.Drawing.Color.ForestGreen; + this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel2.Controls.Add(this.classicLabel3); + this.panel2.Dock = System.Windows.Forms.DockStyle.Top; + this.panel2.Location = new System.Drawing.Point(0, 0); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(212, 38); + this.panel2.TabIndex = 0; + // + // classicLabel3 + // + this.classicLabel3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.classicLabel3.ForeColor = System.Drawing.Color.White; + this.classicLabel3.Location = new System.Drawing.Point(50, 10); + this.classicLabel3.Name = "classicLabel3"; + this.classicLabel3.Size = new System.Drawing.Size(109, 16); + this.classicLabel3.TabIndex = 0; + this.classicLabel3.Text = "Games/Software"; + // + // panel3 + // + this.panel3.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.panel3.BackColor = System.Drawing.Color.Lime; + this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel3.Controls.Add(this.panel4); + this.panel3.Location = new System.Drawing.Point(647, 90); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(214, 209); + this.panel3.TabIndex = 3; + // + // panel4 + // + this.panel4.BackColor = System.Drawing.Color.ForestGreen; + this.panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel4.Controls.Add(this.classicLabel4); + this.panel4.Dock = System.Windows.Forms.DockStyle.Top; + this.panel4.Location = new System.Drawing.Point(0, 0); + this.panel4.Name = "panel4"; + this.panel4.Size = new System.Drawing.Size(212, 38); + this.panel4.TabIndex = 0; + // + // classicLabel4 + // + this.classicLabel4.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.classicLabel4.ForeColor = System.Drawing.Color.White; + this.classicLabel4.Location = new System.Drawing.Point(50, 10); + this.classicLabel4.Name = "classicLabel4"; + this.classicLabel4.Size = new System.Drawing.Size(109, 16); + this.classicLabel4.TabIndex = 0; + this.classicLabel4.Text = "Example Viruses"; + // + // panel5 + // + this.panel5.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.panel5.BackColor = System.Drawing.Color.Lime; + this.panel5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel5.Controls.Add(this.panel6); + this.panel5.Location = new System.Drawing.Point(378, 90); + this.panel5.Name = "panel5"; + this.panel5.Size = new System.Drawing.Size(214, 209); + this.panel5.TabIndex = 4; + // + // panel6 + // + this.panel6.BackColor = System.Drawing.Color.ForestGreen; + this.panel6.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel6.Controls.Add(this.classicLabel5); + this.panel6.Dock = System.Windows.Forms.DockStyle.Top; + this.panel6.Location = new System.Drawing.Point(0, 0); + this.panel6.Name = "panel6"; + this.panel6.Size = new System.Drawing.Size(212, 38); + this.panel6.TabIndex = 0; + // + // classicLabel5 + // + this.classicLabel5.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.classicLabel5.ForeColor = System.Drawing.Color.White; + this.classicLabel5.Location = new System.Drawing.Point(59, 10); + this.classicLabel5.Name = "classicLabel5"; + this.classicLabel5.Size = new System.Drawing.Size(94, 16); + this.classicLabel5.TabIndex = 0; + this.classicLabel5.Text = "Customization"; + // + // panel7 + // + this.panel7.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.panel7.BackColor = System.Drawing.Color.Lime; + this.panel7.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel7.Controls.Add(this.panel8); + this.panel7.Location = new System.Drawing.Point(110, 314); + this.panel7.Name = "panel7"; + this.panel7.Size = new System.Drawing.Size(353, 135); + this.panel7.TabIndex = 5; + // + // panel8 + // + this.panel8.BackColor = System.Drawing.Color.ForestGreen; + this.panel8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel8.Controls.Add(this.classicLabel6); + this.panel8.Dock = System.Windows.Forms.DockStyle.Top; + this.panel8.Location = new System.Drawing.Point(0, 0); + this.panel8.Name = "panel8"; + this.panel8.Size = new System.Drawing.Size(351, 38); + this.panel8.TabIndex = 0; + // + // classicLabel6 + // + this.classicLabel6.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.classicLabel6.ForeColor = System.Drawing.Color.White; + this.classicLabel6.Location = new System.Drawing.Point(129, 10); + this.classicLabel6.Name = "classicLabel6"; + this.classicLabel6.Size = new System.Drawing.Size(87, 16); + this.classicLabel6.TabIndex = 0; + this.classicLabel6.Text = "News Stories"; + // + // panel9 + // + this.panel9.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.panel9.BackColor = System.Drawing.Color.Lime; + this.panel9.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel9.Controls.Add(this.panel10); + this.panel9.Location = new System.Drawing.Point(508, 314); + this.panel9.Name = "panel9"; + this.panel9.Size = new System.Drawing.Size(353, 135); + this.panel9.TabIndex = 6; + // + // panel10 + // + this.panel10.BackColor = System.Drawing.Color.ForestGreen; + this.panel10.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel10.Controls.Add(this.classicLabel7); + this.panel10.Dock = System.Windows.Forms.DockStyle.Top; + this.panel10.Location = new System.Drawing.Point(0, 0); + this.panel10.Name = "panel10"; + this.panel10.Size = new System.Drawing.Size(351, 38); + this.panel10.TabIndex = 0; + // + // classicLabel7 + // + this.classicLabel7.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.classicLabel7.ForeColor = System.Drawing.Color.White; + this.classicLabel7.Location = new System.Drawing.Point(105, 10); + this.classicLabel7.Name = "classicLabel7"; + this.classicLabel7.Size = new System.Drawing.Size(139, 16); + this.classicLabel7.TabIndex = 0; + this.classicLabel7.Text = "History Of Computers"; + // + // _12padams1999 + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.Color.LightGreen; + this.Controls.Add(this.panel9); + this.Controls.Add(this.panel7); + this.Controls.Add(this.panel5); + this.Controls.Add(this.panel3); + this.Controls.Add(this.panel1); + this.Controls.Add(this.classicLabel2); + this.Controls.Add(this.classicLabel1); + this.Name = "_12padams1999"; + this.Size = new System.Drawing.Size(959, 542); + this.panel1.ResumeLayout(false); + this.panel2.ResumeLayout(false); + this.panel3.ResumeLayout(false); + this.panel4.ResumeLayout(false); + this.panel5.ResumeLayout(false); + this.panel6.ResumeLayout(false); + this.panel7.ResumeLayout(false); + this.panel8.ResumeLayout(false); + this.panel9.ResumeLayout(false); + this.panel10.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private Engine.UI.ClassicLabel classicLabel1; + private Engine.UI.ClassicLabel classicLabel2; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Panel panel2; + private Engine.UI.ClassicLabel classicLabel3; + private System.Windows.Forms.Panel panel3; + private System.Windows.Forms.Panel panel4; + private Engine.UI.ClassicLabel classicLabel4; + private System.Windows.Forms.Panel panel5; + private System.Windows.Forms.Panel panel6; + private Engine.UI.ClassicLabel classicLabel5; + private System.Windows.Forms.Panel panel7; + private System.Windows.Forms.Panel panel8; + private Engine.UI.ClassicLabel classicLabel6; + private System.Windows.Forms.Panel panel9; + private System.Windows.Forms.Panel panel10; + private Engine.UI.ClassicLabel classicLabel7; + } +} diff --git a/Histacom2/OS/Win98/Win98Apps/IE4Sites/12padams1999.cs b/Histacom2/OS/Win98/Win98Apps/IE4Sites/12padams1999.cs new file mode 100644 index 0000000..30e56a0 --- /dev/null +++ b/Histacom2/OS/Win98/Win98Apps/IE4Sites/12padams1999.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.Data; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace Histacom2.OS.Win98.Win98Apps.IE4Sites +{ + public partial class _12padams1999 : UserControl + { + public _12padams1999() + { + InitializeComponent(); + } + } +} diff --git a/Histacom2/OS/Win98/Win98Apps/IE4Sites/12padams1999.resx b/Histacom2/OS/Win98/Win98Apps/IE4Sites/12padams1999.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Histacom2/OS/Win98/Win98Apps/IE4Sites/12padams1999.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Histacom2/OS/Win98/Win98Apps/IE4Sites/IE4HomePage.Designer.cs b/Histacom2/OS/Win98/Win98Apps/IE4Sites/IE4HomePage.Designer.cs index b02660f..588f91b 100644 --- a/Histacom2/OS/Win98/Win98Apps/IE4Sites/IE4HomePage.Designer.cs +++ b/Histacom2/OS/Win98/Win98Apps/IE4Sites/IE4HomePage.Designer.cs @@ -69,6 +69,7 @@ this.classicLabel10 = new Histacom2.Engine.UI.ClassicLabel(); this.panel6 = new System.Windows.Forms.Panel(); this.classicLabel25 = new Histacom2.Engine.UI.ClassicLabel(); + this.classicLabel26 = new Histacom2.Engine.UI.ClassicLabel(); this.classicLabel15 = new Histacom2.Engine.UI.ClassicLabel(); this.panel12 = new System.Windows.Forms.Panel(); this.classicLabel9 = new Histacom2.Engine.UI.ClassicLabel(); @@ -234,6 +235,7 @@ // // classicLabel22 // + this.classicLabel22.Cursor = System.Windows.Forms.Cursors.Hand; this.classicLabel22.Dock = System.Windows.Forms.DockStyle.Top; this.classicLabel22.Font = new System.Drawing.Font("Verdana", 8.25F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.classicLabel22.ForeColor = System.Drawing.Color.Navy; @@ -241,7 +243,8 @@ this.classicLabel22.Name = "classicLabel22"; this.classicLabel22.Size = new System.Drawing.Size(197, 14); this.classicLabel22.TabIndex = 20; - this.classicLabel22.Text = " 12padams"; + this.classicLabel22.Text = " http://www.12padams.com/"; + this.classicLabel22.Click += new System.EventHandler(this.classicLabel22_Click); // // classicLabel21 // @@ -252,7 +255,7 @@ this.classicLabel21.Name = "classicLabel21"; this.classicLabel21.Size = new System.Drawing.Size(197, 14); this.classicLabel21.TabIndex = 19; - this.classicLabel21.Text = " Google"; + this.classicLabel21.Text = " http://www.google.com/"; // // panel13 // @@ -536,6 +539,7 @@ // panel6 // this.panel6.Controls.Add(this.classicLabel25); + this.panel6.Controls.Add(this.classicLabel26); this.panel6.Controls.Add(this.classicLabel15); this.panel6.Controls.Add(this.panel12); this.panel6.Controls.Add(this.classicLabel9); @@ -559,12 +563,22 @@ // this.classicLabel25.Dock = System.Windows.Forms.DockStyle.Bottom; this.classicLabel25.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.classicLabel25.Location = new System.Drawing.Point(0, 438); + this.classicLabel25.Location = new System.Drawing.Point(0, 424); this.classicLabel25.Name = "classicLabel25"; this.classicLabel25.Size = new System.Drawing.Size(570, 14); this.classicLabel25.TabIndex = 14; this.classicLabel25.Text = "Last updated: Tuesday, November 03, 1998"; // + // classicLabel26 + // + this.classicLabel26.Dock = System.Windows.Forms.DockStyle.Bottom; + this.classicLabel26.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.classicLabel26.Location = new System.Drawing.Point(0, 438); + this.classicLabel26.Name = "classicLabel26"; + this.classicLabel26.Size = new System.Drawing.Size(570, 14); + this.classicLabel26.TabIndex = 15; + this.classicLabel26.Text = "© 1999 Microsoft Corporation. All rights reserved. Terms of Use."; + // // classicLabel15 // this.classicLabel15.Dock = System.Windows.Forms.DockStyle.Top; @@ -833,5 +847,6 @@ private System.Windows.Forms.PictureBox pictureBox15; private Engine.UI.ClassicLabel classicLabel25; private System.Windows.Forms.PictureBox pictureBox16; + private Engine.UI.ClassicLabel classicLabel26; } } diff --git a/Histacom2/OS/Win98/Win98Apps/IE4Sites/IE4HomePage.cs b/Histacom2/OS/Win98/Win98Apps/IE4Sites/IE4HomePage.cs index 70cf568..900cfd9 100644 --- a/Histacom2/OS/Win98/Win98Apps/IE4Sites/IE4HomePage.cs +++ b/Histacom2/OS/Win98/Win98Apps/IE4Sites/IE4HomePage.cs @@ -30,6 +30,12 @@ namespace Histacom2.OS.Win98.Win98Apps.IE4Sites classicLabel9.Invalidate(); classicLabel15.Invalidate(); classicLabel25.Invalidate(); + classicLabel26.Invalidate(); + } + + private void classicLabel22_Click(object sender, EventArgs e) + { + WinClassicIE4.GoToPage("www.12padams.com"); } } } diff --git a/Histacom2/OS/Win98/Win98Apps/WinClassicIE4.cs b/Histacom2/OS/Win98/Win98Apps/WinClassicIE4.cs index e731303..7d9c9d0 100644 --- a/Histacom2/OS/Win98/Win98Apps/WinClassicIE4.cs +++ b/Histacom2/OS/Win98/Win98Apps/WinClassicIE4.cs @@ -35,10 +35,10 @@ namespace Histacom2.OS.Win98.Win98Apps /* case "www.google.com": uc = new GoogleHome(); - break; - case "www.12padams.com": - uc = new _12padams1998(); break;*/ + case "www.12padams.com": + uc = new _12padams1999(); + break; default: uc = new IENoPage(); break; -- cgit v1.2.3 From 2968c39415d6f4ea4db275d1fc12861843616ae9 Mon Sep 17 00:00:00 2001 From: lempamo Date: Wed, 20 Sep 2017 11:02:43 -0400 Subject: more 12padams stuff --- Histacom2.Engine/Paintbrush.cs | 2 + Histacom2.Engine/UI/ClassicButton.cs | 23 +-- .../Win98Apps/IE4Sites/12padams1999.Designer.cs | 218 +++++++++++++++++++-- 3 files changed, 211 insertions(+), 32 deletions(-) (limited to 'Histacom2.Engine/UI') diff --git a/Histacom2.Engine/Paintbrush.cs b/Histacom2.Engine/Paintbrush.cs index 02cb49b..ff715d2 100644 --- a/Histacom2.Engine/Paintbrush.cs +++ b/Histacom2.Engine/Paintbrush.cs @@ -49,6 +49,7 @@ namespace Histacom2.Engine public static Color GetLightFromColor(Color basecolor) { if (basecolor == Color.Silver) return Color.White; + if (basecolor == Color.Green) return Color.FromArgb(64, 255, 64); if (basecolor == Color.FromArgb(112, 112, 112)) return Color.FromArgb(184, 184, 184); if (basecolor == Color.FromArgb(169, 200, 169)) return Color.FromArgb(218, 223, 218); return ControlPaint.Light(basecolor, 70); @@ -57,6 +58,7 @@ namespace Histacom2.Engine public static Color GetDarkFromColor(Color basecolor) { if (basecolor == Color.Silver) return Color.Gray; + if (basecolor == Color.Green) return Color.FromArgb(0, 83, 0); 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 027d198..29b3a3b 100644 --- a/Histacom2.Engine/UI/ClassicButton.cs +++ b/Histacom2.Engine/UI/ClassicButton.cs @@ -15,26 +15,17 @@ namespace Histacom2.Engine.UI private bool _pressing = false; - public DialogResult DialogResult - { - get - { - throw new NotImplementedException(); - } - - set - { - throw new NotImplementedException(); - } - } + public DialogResult DialogResult { get; set; } - public bool AdaptBackColorWithTheme = true; - public bool AdaptForeColorWithTheme = true; - public bool AdaptFontWithTheme = true; + public bool AdaptBackColorWithTheme { get; set; } + public bool AdaptForeColorWithTheme { get; set; } + public bool AdaptFontWithTheme { get; set; } public ClassicButton() : base() { - + AdaptBackColorWithTheme = true; + AdaptForeColorWithTheme = true; + AdaptFontWithTheme = true; if (SaveSystem.currentTheme != null) BackColor = SaveSystem.currentTheme.threeDObjectsColor; else BackColor = Color.Silver; _lightBack = ControlPaint.Light(BackColor, 50); diff --git a/Histacom2/OS/Win98/Win98Apps/IE4Sites/12padams1999.Designer.cs b/Histacom2/OS/Win98/Win98Apps/IE4Sites/12padams1999.Designer.cs index aeba4df..aa8aae4 100644 --- a/Histacom2/OS/Win98/Win98Apps/IE4Sites/12padams1999.Designer.cs +++ b/Histacom2/OS/Win98/Win98Apps/IE4Sites/12padams1999.Designer.cs @@ -31,6 +31,8 @@ this.classicLabel1 = new Histacom2.Engine.UI.ClassicLabel(); this.classicLabel2 = new Histacom2.Engine.UI.ClassicLabel(); this.panel1 = new System.Windows.Forms.Panel(); + this.classicLabel8 = new Histacom2.Engine.UI.ClassicLabel(); + this.classicButton1 = new Histacom2.Engine.UI.ClassicButton(); this.panel2 = new System.Windows.Forms.Panel(); this.classicLabel3 = new Histacom2.Engine.UI.ClassicLabel(); this.panel3 = new System.Windows.Forms.Panel(); @@ -45,6 +47,17 @@ this.panel9 = new System.Windows.Forms.Panel(); this.panel10 = new System.Windows.Forms.Panel(); this.classicLabel7 = new Histacom2.Engine.UI.ClassicLabel(); + this.classicButton2 = new Histacom2.Engine.UI.ClassicButton(); + this.classicLabel9 = new Histacom2.Engine.UI.ClassicLabel(); + this.classicButton3 = new Histacom2.Engine.UI.ClassicButton(); + this.classicLabel10 = new Histacom2.Engine.UI.ClassicLabel(); + this.classicButton4 = new Histacom2.Engine.UI.ClassicButton(); + this.classicLabel11 = new Histacom2.Engine.UI.ClassicLabel(); + this.classicLabel12 = new Histacom2.Engine.UI.ClassicLabel(); + this.classicButton5 = new Histacom2.Engine.UI.ClassicButton(); + this.classicLabel13 = new Histacom2.Engine.UI.ClassicLabel(); + this.classicButton6 = new Histacom2.Engine.UI.ClassicButton(); + this.classicLabel14 = new Histacom2.Engine.UI.ClassicLabel(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); this.panel3.SuspendLayout(); @@ -61,7 +74,7 @@ // this.classicLabel1.Anchor = System.Windows.Forms.AnchorStyles.Top; this.classicLabel1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.classicLabel1.Location = new System.Drawing.Point(353, 12); + this.classicLabel1.Location = new System.Drawing.Point(347, 12); this.classicLabel1.Name = "classicLabel1"; this.classicLabel1.Size = new System.Drawing.Size(271, 16); this.classicLabel1.TabIndex = 0; @@ -70,7 +83,7 @@ // classicLabel2 // this.classicLabel2.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.classicLabel2.Location = new System.Drawing.Point(367, 34); + this.classicLabel2.Location = new System.Drawing.Point(361, 34); this.classicLabel2.Name = "classicLabel2"; this.classicLabel2.Size = new System.Drawing.Size(250, 13); this.classicLabel2.TabIndex = 1; @@ -81,12 +94,39 @@ this.panel1.Anchor = System.Windows.Forms.AnchorStyles.Top; this.panel1.BackColor = System.Drawing.Color.Lime; this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel1.Controls.Add(this.classicLabel9); + this.panel1.Controls.Add(this.classicButton2); + this.panel1.Controls.Add(this.classicLabel8); + this.panel1.Controls.Add(this.classicButton1); this.panel1.Controls.Add(this.panel2); - this.panel1.Location = new System.Drawing.Point(110, 90); + this.panel1.Location = new System.Drawing.Point(104, 90); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(214, 209); + this.panel1.Size = new System.Drawing.Size(225, 209); this.panel1.TabIndex = 2; // + // classicLabel8 + // + this.classicLabel8.Location = new System.Drawing.Point(4, 49); + this.classicLabel8.Name = "classicLabel8"; + this.classicLabel8.Size = new System.Drawing.Size(121, 13); + this.classicLabel8.TabIndex = 2; + this.classicLabel8.Text = "Guess The Number V2"; + // + // classicButton1 + // + this.classicButton1.AdaptBackColorWithTheme = false; + this.classicButton1.AdaptFontWithTheme = true; + this.classicButton1.AdaptForeColorWithTheme = true; + this.classicButton1.BackColor = System.Drawing.Color.Green; + this.classicButton1.DialogResult = System.Windows.Forms.DialogResult.None; + this.classicButton1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); + this.classicButton1.ForeColor = System.Drawing.Color.Black; + this.classicButton1.Location = new System.Drawing.Point(144, 45); + this.classicButton1.Name = "classicButton1"; + this.classicButton1.Size = new System.Drawing.Size(72, 23); + this.classicButton1.TabIndex = 1; + this.classicButton1.Text = "Download"; + // // panel2 // this.panel2.BackColor = System.Drawing.Color.ForestGreen; @@ -95,14 +135,14 @@ this.panel2.Dock = System.Windows.Forms.DockStyle.Top; this.panel2.Location = new System.Drawing.Point(0, 0); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(212, 38); + this.panel2.Size = new System.Drawing.Size(223, 38); this.panel2.TabIndex = 0; // // classicLabel3 // this.classicLabel3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.classicLabel3.ForeColor = System.Drawing.Color.White; - this.classicLabel3.Location = new System.Drawing.Point(50, 10); + this.classicLabel3.Location = new System.Drawing.Point(58, 10); this.classicLabel3.Name = "classicLabel3"; this.classicLabel3.Size = new System.Drawing.Size(109, 16); this.classicLabel3.TabIndex = 0; @@ -113,10 +153,14 @@ this.panel3.Anchor = System.Windows.Forms.AnchorStyles.Top; this.panel3.BackColor = System.Drawing.Color.Lime; this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel3.Controls.Add(this.classicLabel12); + this.panel3.Controls.Add(this.classicButton5); + this.panel3.Controls.Add(this.classicLabel13); + this.panel3.Controls.Add(this.classicButton6); this.panel3.Controls.Add(this.panel4); - this.panel3.Location = new System.Drawing.Point(647, 90); + this.panel3.Location = new System.Drawing.Point(630, 90); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(214, 209); + this.panel3.Size = new System.Drawing.Size(225, 209); this.panel3.TabIndex = 3; // // panel4 @@ -127,14 +171,14 @@ this.panel4.Dock = System.Windows.Forms.DockStyle.Top; this.panel4.Location = new System.Drawing.Point(0, 0); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(212, 38); + this.panel4.Size = new System.Drawing.Size(223, 38); this.panel4.TabIndex = 0; // // classicLabel4 // this.classicLabel4.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.classicLabel4.ForeColor = System.Drawing.Color.White; - this.classicLabel4.Location = new System.Drawing.Point(50, 10); + this.classicLabel4.Location = new System.Drawing.Point(57, 10); this.classicLabel4.Name = "classicLabel4"; this.classicLabel4.Size = new System.Drawing.Size(109, 16); this.classicLabel4.TabIndex = 0; @@ -145,10 +189,14 @@ this.panel5.Anchor = System.Windows.Forms.AnchorStyles.Top; this.panel5.BackColor = System.Drawing.Color.Lime; this.panel5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel5.Controls.Add(this.classicLabel11); + this.panel5.Controls.Add(this.classicButton4); + this.panel5.Controls.Add(this.classicLabel10); + this.panel5.Controls.Add(this.classicButton3); this.panel5.Controls.Add(this.panel6); - this.panel5.Location = new System.Drawing.Point(378, 90); + this.panel5.Location = new System.Drawing.Point(369, 90); this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(214, 209); + this.panel5.Size = new System.Drawing.Size(225, 209); this.panel5.TabIndex = 4; // // panel6 @@ -159,14 +207,14 @@ this.panel6.Dock = System.Windows.Forms.DockStyle.Top; this.panel6.Location = new System.Drawing.Point(0, 0); this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(212, 38); + this.panel6.Size = new System.Drawing.Size(223, 38); this.panel6.TabIndex = 0; // // classicLabel5 // this.classicLabel5.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.classicLabel5.ForeColor = System.Drawing.Color.White; - this.classicLabel5.Location = new System.Drawing.Point(59, 10); + this.classicLabel5.Location = new System.Drawing.Point(62, 10); this.classicLabel5.Name = "classicLabel5"; this.classicLabel5.Size = new System.Drawing.Size(94, 16); this.classicLabel5.TabIndex = 0; @@ -178,7 +226,7 @@ this.panel7.BackColor = System.Drawing.Color.Lime; this.panel7.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.panel7.Controls.Add(this.panel8); - this.panel7.Location = new System.Drawing.Point(110, 314); + this.panel7.Location = new System.Drawing.Point(104, 314); this.panel7.Name = "panel7"; this.panel7.Size = new System.Drawing.Size(353, 135); this.panel7.TabIndex = 5; @@ -210,7 +258,7 @@ this.panel9.BackColor = System.Drawing.Color.Lime; this.panel9.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.panel9.Controls.Add(this.panel10); - this.panel9.Location = new System.Drawing.Point(508, 314); + this.panel9.Location = new System.Drawing.Point(502, 314); this.panel9.Name = "panel9"; this.panel9.Size = new System.Drawing.Size(353, 135); this.panel9.TabIndex = 6; @@ -236,11 +284,136 @@ this.classicLabel7.TabIndex = 0; this.classicLabel7.Text = "History Of Computers"; // + // classicButton2 + // + this.classicButton2.AdaptBackColorWithTheme = false; + this.classicButton2.AdaptFontWithTheme = true; + this.classicButton2.AdaptForeColorWithTheme = true; + this.classicButton2.BackColor = System.Drawing.Color.Green; + this.classicButton2.DialogResult = System.Windows.Forms.DialogResult.None; + this.classicButton2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); + this.classicButton2.ForeColor = System.Drawing.Color.Black; + this.classicButton2.Location = new System.Drawing.Point(144, 74); + this.classicButton2.Name = "classicButton2"; + this.classicButton2.Size = new System.Drawing.Size(72, 23); + this.classicButton2.TabIndex = 3; + this.classicButton2.Text = "Download"; + // + // classicLabel9 + // + this.classicLabel9.Location = new System.Drawing.Point(4, 79); + this.classicLabel9.Name = "classicLabel9"; + this.classicLabel9.Size = new System.Drawing.Size(121, 13); + this.classicLabel9.TabIndex = 4; + this.classicLabel9.Text = "Web Chat 1999"; + // + // classicButton3 + // + this.classicButton3.AdaptBackColorWithTheme = false; + this.classicButton3.AdaptFontWithTheme = true; + this.classicButton3.AdaptForeColorWithTheme = true; + this.classicButton3.BackColor = System.Drawing.Color.Green; + this.classicButton3.DialogResult = System.Windows.Forms.DialogResult.None; + this.classicButton3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); + this.classicButton3.ForeColor = System.Drawing.Color.Black; + this.classicButton3.Location = new System.Drawing.Point(116, 44); + this.classicButton3.Name = "classicButton3"; + this.classicButton3.Size = new System.Drawing.Size(99, 23); + this.classicButton3.TabIndex = 2; + this.classicButton3.Text = "View Backgrounds"; + // + // classicLabel10 + // + this.classicLabel10.Location = new System.Drawing.Point(3, 49); + this.classicLabel10.Name = "classicLabel10"; + this.classicLabel10.Size = new System.Drawing.Size(107, 13); + this.classicLabel10.TabIndex = 5; + this.classicLabel10.Text = "Backgrounds"; + // + // classicButton4 + // + this.classicButton4.AdaptBackColorWithTheme = false; + this.classicButton4.AdaptFontWithTheme = true; + this.classicButton4.AdaptForeColorWithTheme = true; + this.classicButton4.BackColor = System.Drawing.Color.Green; + this.classicButton4.DialogResult = System.Windows.Forms.DialogResult.None; + this.classicButton4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); + this.classicButton4.ForeColor = System.Drawing.Color.Black; + this.classicButton4.Location = new System.Drawing.Point(116, 73); + this.classicButton4.Name = "classicButton4"; + this.classicButton4.Size = new System.Drawing.Size(99, 23); + this.classicButton4.TabIndex = 6; + this.classicButton4.Text = "Info"; + // + // classicLabel11 + // + this.classicLabel11.Location = new System.Drawing.Point(3, 79); + this.classicLabel11.Name = "classicLabel11"; + this.classicLabel11.Size = new System.Drawing.Size(107, 13); + this.classicLabel11.TabIndex = 7; + this.classicLabel11.Text = "Skindows 98"; + // + // classicLabel12 + // + this.classicLabel12.Location = new System.Drawing.Point(5, 79); + this.classicLabel12.Name = "classicLabel12"; + this.classicLabel12.Size = new System.Drawing.Size(121, 13); + this.classicLabel12.TabIndex = 8; + this.classicLabel12.Text = "Error Blaster 98"; + // + // classicButton5 + // + this.classicButton5.AdaptBackColorWithTheme = false; + this.classicButton5.AdaptFontWithTheme = true; + this.classicButton5.AdaptForeColorWithTheme = true; + this.classicButton5.BackColor = System.Drawing.Color.Green; + this.classicButton5.DialogResult = System.Windows.Forms.DialogResult.None; + this.classicButton5.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); + this.classicButton5.ForeColor = System.Drawing.Color.Black; + this.classicButton5.Location = new System.Drawing.Point(145, 74); + this.classicButton5.Name = "classicButton5"; + this.classicButton5.Size = new System.Drawing.Size(72, 23); + this.classicButton5.TabIndex = 7; + this.classicButton5.Text = "Download"; + // + // classicLabel13 + // + this.classicLabel13.Location = new System.Drawing.Point(5, 49); + this.classicLabel13.Name = "classicLabel13"; + this.classicLabel13.Size = new System.Drawing.Size(121, 13); + this.classicLabel13.TabIndex = 6; + this.classicLabel13.Text = "Start Runner 98"; + // + // classicButton6 + // + this.classicButton6.AdaptBackColorWithTheme = false; + this.classicButton6.AdaptFontWithTheme = true; + this.classicButton6.AdaptForeColorWithTheme = true; + this.classicButton6.BackColor = System.Drawing.Color.Green; + this.classicButton6.DialogResult = System.Windows.Forms.DialogResult.None; + this.classicButton6.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); + this.classicButton6.ForeColor = System.Drawing.Color.Black; + this.classicButton6.Location = new System.Drawing.Point(145, 45); + this.classicButton6.Name = "classicButton6"; + this.classicButton6.Size = new System.Drawing.Size(72, 23); + this.classicButton6.TabIndex = 5; + this.classicButton6.Text = "Download"; + // + // classicLabel14 + // + this.classicLabel14.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.classicLabel14.Location = new System.Drawing.Point(430, 460); + this.classicLabel14.Name = "classicLabel14"; + this.classicLabel14.Size = new System.Drawing.Size(100, 13); + this.classicLabel14.TabIndex = 7; + this.classicLabel14.Text = "© 12padams, 1999"; + // // _12padams1999 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.LightGreen; + this.Controls.Add(this.classicLabel14); this.Controls.Add(this.panel9); this.Controls.Add(this.panel7); this.Controls.Add(this.panel5); @@ -283,5 +456,18 @@ private System.Windows.Forms.Panel panel9; private System.Windows.Forms.Panel panel10; private Engine.UI.ClassicLabel classicLabel7; + private Engine.UI.ClassicLabel classicLabel8; + private Engine.UI.ClassicButton classicButton1; + private Engine.UI.ClassicLabel classicLabel9; + private Engine.UI.ClassicButton classicButton2; + private Engine.UI.ClassicLabel classicLabel11; + private Engine.UI.ClassicButton classicButton4; + private Engine.UI.ClassicLabel classicLabel10; + private Engine.UI.ClassicButton classicButton3; + private Engine.UI.ClassicLabel classicLabel12; + private Engine.UI.ClassicButton classicButton5; + private Engine.UI.ClassicLabel classicLabel13; + private Engine.UI.ClassicButton classicButton6; + private Engine.UI.ClassicLabel classicLabel14; } } -- cgit v1.2.3 From 1ee3e00f8f0ee879fce4edf7d1ba9889335bc826 Mon Sep 17 00:00:00 2001 From: lempamo Date: Sat, 23 Sep 2017 12:23:10 -0400 Subject: EULA Pane & Disabled buttons --- Histacom2.Engine/UI/ClassicButton.cs | 8 +- .../InstallerPanes/DirectoryPane.Designer.cs | 8 +- .../GlobalPrograms/InstallerPanes/DirectoryPane.cs | 3 + .../InstallerPanes/EULAPane.Designer.cs | 159 +++++++++++++++++++++ .../GlobalPrograms/InstallerPanes/EULAPane.cs | 28 ++++ .../GlobalPrograms/InstallerPanes/EULAPane.resx | 137 ++++++++++++++++++ .../GlobalPrograms/WinClassicInstaller.Designer.cs | 1 + Histacom2/GlobalPrograms/WinClassicInstaller.cs | 6 +- Histacom2/Histacom2.csproj | 9 ++ 9 files changed, 350 insertions(+), 9 deletions(-) create mode 100644 Histacom2/GlobalPrograms/InstallerPanes/EULAPane.Designer.cs create mode 100644 Histacom2/GlobalPrograms/InstallerPanes/EULAPane.cs create mode 100644 Histacom2/GlobalPrograms/InstallerPanes/EULAPane.resx (limited to 'Histacom2.Engine/UI') diff --git a/Histacom2.Engine/UI/ClassicButton.cs b/Histacom2.Engine/UI/ClassicButton.cs index 29b3a3b..4ccdbe6 100644 --- a/Histacom2.Engine/UI/ClassicButton.cs +++ b/Histacom2.Engine/UI/ClassicButton.cs @@ -63,16 +63,17 @@ namespace Histacom2.Engine.UI g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.SingleBitPerPixelGridFit; StringFormat sf = new StringFormat(); sf.Alignment = StringAlignment.Center; + sf.LineAlignment = StringAlignment.Center; sf.HotkeyPrefix = System.Drawing.Text.HotkeyPrefix.Show; - if (_pressing) + if (_pressing && Enabled) { 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) + 1) + Padding.Left, (Height / 2) - (g.MeasureString(Text, Font).Height / 2) + 2, sf); + g.DrawString(Text, Font, new SolidBrush(ForeColor), new Rectangle(2, 2, Width - 3, Height - 3), sf); } else { @@ -81,7 +82,8 @@ 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); + if (Enabled) g.DrawString(Text, Font, new SolidBrush(ForeColor), new Rectangle(1, 1, Width - 3, Height - 3), sf); + else g.DrawString(Text, Font, new SolidBrush(_darkBack), new Rectangle(1, 1, Width - 3, Height - 3), sf); } } diff --git a/Histacom2/GlobalPrograms/InstallerPanes/DirectoryPane.Designer.cs b/Histacom2/GlobalPrograms/InstallerPanes/DirectoryPane.Designer.cs index 6759dd9..6946002 100644 --- a/Histacom2/GlobalPrograms/InstallerPanes/DirectoryPane.Designer.cs +++ b/Histacom2/GlobalPrograms/InstallerPanes/DirectoryPane.Designer.cs @@ -101,16 +101,16 @@ // this.groupBox1.Controls.Add(this.classicButton1); this.groupBox1.Controls.Add(this.classicLabel5); - this.groupBox1.Location = new System.Drawing.Point(24, 231); + this.groupBox1.Location = new System.Drawing.Point(24, 225); this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(447, 50); + this.groupBox1.Size = new System.Drawing.Size(447, 56); this.groupBox1.TabIndex = 3; this.groupBox1.TabStop = false; this.groupBox1.Text = "Destination Folder"; // // classicLabel5 // - this.classicLabel5.Location = new System.Drawing.Point(12, 22); + this.classicLabel5.Location = new System.Drawing.Point(12, 27); this.classicLabel5.Name = "classicLabel5"; this.classicLabel5.Size = new System.Drawing.Size(311, 13); this.classicLabel5.TabIndex = 0; @@ -125,7 +125,7 @@ this.classicButton1.DialogResult = System.Windows.Forms.DialogResult.None; this.classicButton1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); this.classicButton1.ForeColor = System.Drawing.Color.Black; - this.classicButton1.Location = new System.Drawing.Point(365, 16); + this.classicButton1.Location = new System.Drawing.Point(365, 22); this.classicButton1.Name = "classicButton1"; this.classicButton1.Size = new System.Drawing.Size(75, 23); this.classicButton1.TabIndex = 1; diff --git a/Histacom2/GlobalPrograms/InstallerPanes/DirectoryPane.cs b/Histacom2/GlobalPrograms/InstallerPanes/DirectoryPane.cs index 7e415dd..ae30ae0 100644 --- a/Histacom2/GlobalPrograms/InstallerPanes/DirectoryPane.cs +++ b/Histacom2/GlobalPrograms/InstallerPanes/DirectoryPane.cs @@ -7,6 +7,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using Histacom2.Engine; namespace Histacom2.GlobalPrograms.InstallerPanes { @@ -21,6 +22,8 @@ namespace Histacom2.GlobalPrograms.InstallerPanes { classicLabel3.Text = $"Setup will install {((WinClassicInstaller)Parent.Parent).progName} to the destination folder."; classicLabel5.Text = $"C:\\Program Files\\12padams\\{((WinClassicInstaller)Parent.Parent).progName}\\"; + + groupBox1.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular); } } } diff --git a/Histacom2/GlobalPrograms/InstallerPanes/EULAPane.Designer.cs b/Histacom2/GlobalPrograms/InstallerPanes/EULAPane.Designer.cs new file mode 100644 index 0000000..90dbbb1 --- /dev/null +++ b/Histacom2/GlobalPrograms/InstallerPanes/EULAPane.Designer.cs @@ -0,0 +1,159 @@ +namespace Histacom2.GlobalPrograms.InstallerPanes +{ + partial class EULAPane + { + /// + /// 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() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EULAPane)); + this.panel1 = new System.Windows.Forms.Panel(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.classicLabel2 = new Histacom2.Engine.UI.ClassicLabel(); + this.classicLabel1 = new Histacom2.Engine.UI.ClassicLabel(); + this.classicLabel3 = new Histacom2.Engine.UI.ClassicLabel(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.radioButton1 = new System.Windows.Forms.RadioButton(); + this.radioButton2 = new System.Windows.Forms.RadioButton(); + this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.SuspendLayout(); + // + // panel1 + // + this.panel1.BackColor = System.Drawing.Color.White; + this.panel1.Controls.Add(this.pictureBox1); + this.panel1.Controls.Add(this.classicLabel2); + this.panel1.Controls.Add(this.classicLabel1); + this.panel1.Dock = System.Windows.Forms.DockStyle.Top; + this.panel1.Location = new System.Drawing.Point(0, 0); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(495, 58); + this.panel1.TabIndex = 0; + // + // pictureBox1 + // + this.pictureBox1.BackgroundImage = global::Histacom2.Properties.Resources.WinClassicInstallIcon; + this.pictureBox1.Location = new System.Drawing.Point(440, 2); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(53, 53); + this.pictureBox1.TabIndex = 2; + this.pictureBox1.TabStop = false; + // + // classicLabel2 + // + this.classicLabel2.Location = new System.Drawing.Point(40, 28); + this.classicLabel2.Name = "classicLabel2"; + this.classicLabel2.Size = new System.Drawing.Size(394, 13); + this.classicLabel2.TabIndex = 1; + this.classicLabel2.Text = "Please read the following important information before continuing."; + // + // classicLabel1 + // + this.classicLabel1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.classicLabel1.Location = new System.Drawing.Point(25, 12); + this.classicLabel1.Name = "classicLabel1"; + this.classicLabel1.Size = new System.Drawing.Size(274, 13); + this.classicLabel1.TabIndex = 0; + this.classicLabel1.Text = "License  Agree m e n t"; + // + // classicLabel3 + // + this.classicLabel3.Location = new System.Drawing.Point(25, 73); + this.classicLabel3.Name = "classicLabel3"; + this.classicLabel3.Size = new System.Drawing.Size(457, 26); + this.classicLabel3.TabIndex = 1; + this.classicLabel3.Text = "Please read the following license agreement. You must accept the terms of this ag" + + "reement before continuing with the installation."; + // + // textBox1 + // + this.textBox1.BackColor = System.Drawing.Color.White; + this.textBox1.Location = new System.Drawing.Point(25, 105); + this.textBox1.Multiline = true; + this.textBox1.Name = "textBox1"; + this.textBox1.ReadOnly = true; + this.textBox1.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; + this.textBox1.Size = new System.Drawing.Size(446, 147); + this.textBox1.TabIndex = 2; + this.textBox1.Text = resources.GetString("textBox1.Text"); + // + // radioButton1 + // + this.radioButton1.AutoSize = true; + this.radioButton1.BackColor = System.Drawing.Color.Silver; + this.radioButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.radioButton1.Location = new System.Drawing.Point(25, 259); + this.radioButton1.Name = "radioButton1"; + this.radioButton1.Size = new System.Drawing.Size(134, 17); + this.radioButton1.TabIndex = 3; + this.radioButton1.Text = "I &accept the agreement"; + this.radioButton1.UseVisualStyleBackColor = false; + // + // radioButton2 + // + this.radioButton2.AutoSize = true; + this.radioButton2.Checked = true; + this.radioButton2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.radioButton2.Location = new System.Drawing.Point(25, 280); + this.radioButton2.Name = "radioButton2"; + this.radioButton2.Size = new System.Drawing.Size(167, 17); + this.radioButton2.TabIndex = 4; + this.radioButton2.TabStop = true; + this.radioButton2.Text = "I &do not accept the agreement"; + this.radioButton2.UseVisualStyleBackColor = true; + // + // EULAPane + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.Color.Silver; + this.Controls.Add(this.radioButton2); + this.Controls.Add(this.radioButton1); + this.Controls.Add(this.textBox1); + this.Controls.Add(this.classicLabel3); + this.Controls.Add(this.panel1); + this.Name = "EULAPane"; + this.Size = new System.Drawing.Size(495, 314); + this.Load += new System.EventHandler(this.DirectoryPane_Load); + this.panel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Panel panel1; + private Engine.UI.ClassicLabel classicLabel1; + private Engine.UI.ClassicLabel classicLabel2; + private System.Windows.Forms.PictureBox pictureBox1; + private Engine.UI.ClassicLabel classicLabel3; + private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.RadioButton radioButton1; + private System.Windows.Forms.RadioButton radioButton2; + } +} diff --git a/Histacom2/GlobalPrograms/InstallerPanes/EULAPane.cs b/Histacom2/GlobalPrograms/InstallerPanes/EULAPane.cs new file mode 100644 index 0000000..c477836 --- /dev/null +++ b/Histacom2/GlobalPrograms/InstallerPanes/EULAPane.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.Data; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using Histacom2.Engine; + +namespace Histacom2.GlobalPrograms.InstallerPanes +{ + public partial class EULAPane : UserControl + { + public EULAPane() + { + InitializeComponent(); + } + + private void DirectoryPane_Load(object sender, EventArgs e) + { + textBox1.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular); + radioButton1.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular); + radioButton2.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular); + } + } +} diff --git a/Histacom2/GlobalPrograms/InstallerPanes/EULAPane.resx b/Histacom2/GlobalPrograms/InstallerPanes/EULAPane.resx new file mode 100644 index 0000000..fec481c --- /dev/null +++ b/Histacom2/GlobalPrograms/InstallerPanes/EULAPane.resx @@ -0,0 +1,137 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + By installing this software you agree that you will not try to reverse engineer it in anyway or claim it as your own work. + +You agree that you will not try to spread this software or any of its components to other companies without rightful permission from the owner. + +You agree that if you bought this program, you own it and that nobody else is allowed to use it on your computer or on their computer. + +You understand that trying to upload this software online or any other forms of spreading this software will result in the FBI coming into your home and killing you with knives. + +You agree that taking a picture of this software and sending it to someone will cause you to get 15 years in jail for software exposing. + +You agree that if you tell someone else about this software's features that you will wake up dead in the morning because the owner would have killed you in your sleep. + +You know that using this software will alert the maker of it and then cause him to monitor every moment of your life after you install this software. + +You agree to all of the above and will not commit any of the crimes otherwise you will go to Hell. + + \ No newline at end of file diff --git a/Histacom2/GlobalPrograms/WinClassicInstaller.Designer.cs b/Histacom2/GlobalPrograms/WinClassicInstaller.Designer.cs index 246f7aa..20688b5 100644 --- a/Histacom2/GlobalPrograms/WinClassicInstaller.Designer.cs +++ b/Histacom2/GlobalPrograms/WinClassicInstaller.Designer.cs @@ -90,6 +90,7 @@ this.classicButton3.AdaptForeColorWithTheme = true; this.classicButton3.BackColor = System.Drawing.Color.Silver; this.classicButton3.DialogResult = System.Windows.Forms.DialogResult.None; + this.classicButton3.Enabled = false; this.classicButton3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); this.classicButton3.ForeColor = System.Drawing.Color.Black; this.classicButton3.Location = new System.Drawing.Point(248, 326); diff --git a/Histacom2/GlobalPrograms/WinClassicInstaller.cs b/Histacom2/GlobalPrograms/WinClassicInstaller.cs index ff1b7c4..4e0098c 100644 --- a/Histacom2/GlobalPrograms/WinClassicInstaller.cs +++ b/Histacom2/GlobalPrograms/WinClassicInstaller.cs @@ -35,8 +35,10 @@ namespace Histacom2.GlobalPrograms if (state == 0) { - var dir = new InstallerPanes.DirectoryPane(); - dir.Parent = panel1; + var eula = new InstallerPanes.EULAPane(); + eula.Parent = panel1; + state = 1; + classicButton2.Enabled = false; } } } diff --git a/Histacom2/Histacom2.csproj b/Histacom2/Histacom2.csproj index 2411b68..1edcc08 100644 --- a/Histacom2/Histacom2.csproj +++ b/Histacom2/Histacom2.csproj @@ -132,6 +132,12 @@ AchievementBox.cs + + UserControl + + + EULAPane.cs + UserControl @@ -419,6 +425,9 @@ AchievementBox.cs + + EULAPane.cs + DirectoryPane.cs -- cgit v1.2.3