From 859e2483cbfd124d3dde85f1654df9aaa17ca605 Mon Sep 17 00:00:00 2001 From: lempamo Date: Tue, 5 Sep 2017 20:05:28 -0400 Subject: [PATCH] buttons and window colors --- Histacom2.Engine/Paintbrush.cs | 12 ++ .../Template/Infobox95.Designer.cs | 55 +++---- Histacom2.Engine/Template/Infobox95.cs | 8 + .../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 ++- .../WinClassicThemePanel.Designer.cs | 18 +-- .../Win95/Win95Apps/WinClassicThemePanel.cs | 4 + .../Win95Apps/WinClassicWelcome.Designer.cs | 80 +++++----- .../OS/Win95/Win95Apps/WinClassicWelcome.cs | 7 - Histacom2/OS/Win98/Win98.Designer.cs | 150 +++++++++--------- Histacom2/OS/Win98/Win98.resx | 34 ++-- 14 files changed, 337 insertions(+), 196 deletions(-) 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 @@ public static void ExtendedToolStripSeparator_Paint(object sender, PaintEventArg // 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 @@ protected override void Dispose(bool disposing) 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ public partial class Infobox95 : UserControl public Infobox95(InfoboxType type, InfoboxButtons btns) { InitializeComponent(); + this.BackColor = SaveSystem.currentTheme.threeDObjectsColor; + this.programContent.BackColor = SaveSystem.currentTheme.threeDObjectsColor; switch (type) { @@ -63,6 +65,12 @@ private void button1_Click(object sender, EventArgs e) { 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ public WinClassic() { InitializeComponent(); DoubleBuffered = true; + programContent.BackColor = SaveSystem.currentTheme.threeDObjectsColor; } public Font fnt; @@ -207,6 +208,105 @@ private void border_MouseDown(object sender, MouseEventArgs e) 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 @@ public class Theme 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 @@ public Default95Theme() 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 @@ public Default98Theme() 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 @@ public DangerousCreaturesTheme() 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 @@ public ClassicButton() : base() 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 @@ protected override void OnPaint(PaintEventArgs e) 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 @@ protected override void OnPaint(PaintEventArgs e) 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() // // 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 void InitializeComponent() 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 @@ private void applyButton_Click(object sender, EventArgs e) ((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 @@ private void okButton_Click(object sender, EventArgs e) ((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 @@ private void InitializeComponent() { 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,43 +59,6 @@ private void InitializeComponent() this.imgPnl.TabIndex = 16; this.imgPnl.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.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.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; - // - // 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.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; @@ -106,6 +69,37 @@ private void InitializeComponent() this.imgWelcome.TabIndex = 18; this.imgWelcome.TabStop = false; // + // btnClose + // + this.btnClose.BackColor = System.Drawing.Color.Silver; + 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.Click += new System.EventHandler(this.btnClose_Click); + // + // btnOnline + // + this.btnOnline.BackColor = System.Drawing.Color.Silver; + 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"; + // + // btnTour + // + this.btnTour.BackColor = System.Drawing.Color.Silver; + 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"; + // // WinClassicWelcome // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -130,9 +124,9 @@ private void InitializeComponent() 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 @@ public partial class WinClassicWelcome : UserControl 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() // 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() 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 @@ private void InitializeComponent() // 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 @@ private void InitializeComponent() 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/