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/OS/Win95/Win95Apps/WinClassicThemePanel.cs | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs') 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(); -- cgit v1.2.3 From 410b793a8bd68af20521623f2c41d9608df32af4 Mon Sep 17 00:00:00 2001 From: lempamo Date: Tue, 5 Sep 2017 21:13:06 -0400 Subject: windows now change theme immediately --- Histacom2.Engine/Paintbrush.cs | 7 +++++-- Histacom2.Engine/Template/WinClassic.cs | 1 + Histacom2.Engine/Theme.cs | 5 +++++ Histacom2.Engine/WindowManager.cs | 1 + .../OS/Win95/Win95Apps/WinClassicThemePanel.cs | 24 ++++++++++++++++++++-- 5 files changed, 34 insertions(+), 4 deletions(-) (limited to 'Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs') diff --git a/Histacom2.Engine/Paintbrush.cs b/Histacom2.Engine/Paintbrush.cs index ab84491..4424371 100644 --- a/Histacom2.Engine/Paintbrush.cs +++ b/Histacom2.Engine/Paintbrush.cs @@ -48,14 +48,17 @@ namespace Histacom2.Engine public static Color GetLightFromColor(Color basecolor) { + if (basecolor == Color.Silver) return Color.White; if (basecolor == Color.FromArgb(112, 112, 112)) return Color.FromArgb(184, 184, 184); - return ControlPaint.Light(basecolor, 50); + if (basecolor == Color.FromArgb(169, 200, 169)) return Color.FromArgb(218, 223, 218); + return ControlPaint.Light(basecolor, 70); } public static Color GetDarkFromColor(Color basecolor) { if (basecolor == Color.FromArgb(112, 112, 112)) return Color.FromArgb(72, 72, 72); - return ControlPaint.Dark(basecolor, 50); + if (basecolor == Color.FromArgb(169, 200, 169)) return Color.FromArgb(95, 153, 95); + return ControlPaint.Dark(basecolor, 70); } } } diff --git a/Histacom2.Engine/Template/WinClassic.cs b/Histacom2.Engine/Template/WinClassic.cs index c1c7fe1..0ccbe5b 100644 --- a/Histacom2.Engine/Template/WinClassic.cs +++ b/Histacom2.Engine/Template/WinClassic.cs @@ -16,6 +16,7 @@ namespace Histacom2.Engine.Template public Font fnt; public ResizeOverlay resizer = new ResizeOverlay(); + public UserControl progContent; public bool resizable = true; public bool closeDisabled = false; diff --git a/Histacom2.Engine/Theme.cs b/Histacom2.Engine/Theme.cs index 8aa9dcf..5b5ae50 100644 --- a/Histacom2.Engine/Theme.cs +++ b/Histacom2.Engine/Theme.cs @@ -127,6 +127,11 @@ namespace Histacom2.Engine asteriskSound = Properties.Resources.Win95PlusInsideComputerAsterisk; + threeDObjectsColor = Color.FromArgb(169, 200, 169); + threeDObjectsTextColor = Color.Black; + + buttonFont = new Font("Microsoft Sans Serif", 8.25F, FontStyle.Bold); + activeTitleBarColor = Color.FromArgb(224, 0, 0); activeTitleTextColor = Color.White; inactiveTitleBarColor = Color.FromArgb(96, 168, 128); diff --git a/Histacom2.Engine/WindowManager.cs b/Histacom2.Engine/WindowManager.cs index cffb74a..4f4951c 100644 --- a/Histacom2.Engine/WindowManager.cs +++ b/Histacom2.Engine/WindowManager.cs @@ -60,6 +60,7 @@ namespace Histacom2.Engine content.Parent = app.programContent; content.BringToFront(); content.Dock = DockStyle.Fill; + app.progContent = content; // Check if icon is null if (icon == null) diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs index da354bf..d491eef 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs @@ -96,7 +96,17 @@ namespace Histacom2.OS.Win95.Win95Apps ((WinClassic)f).Title.ForeColor = SaveSystem.currentTheme.inactiveTitleTextColor; } f.Invalidate(); - foreach (Control c in f.Controls) c.Invalidate(); + ((WinClassic)f).programContent.Invalidate(); + ((WinClassic)f).top.Invalidate(); + ((WinClassic)f).toprightcorner.Invalidate(); + ((WinClassic)f).right.Invalidate(); + ((WinClassic)f).bottomrightcorner.Invalidate(); + ((WinClassic)f).bottom.Invalidate(); + ((WinClassic)f).bottomleftcorner.Invalidate(); + ((WinClassic)f).left.Invalidate(); + ((WinClassic)f).topleftcorner.Invalidate(); + foreach (Control c in ((WinClassic)f).progContent.Controls) c.Invalidate(); + ((WinClassic)f).progContent.BackColor = SaveSystem.currentTheme.threeDObjectsColor; } } } @@ -139,7 +149,17 @@ namespace Histacom2.OS.Win95.Win95Apps ((WinClassic)f).Title.ForeColor = SaveSystem.currentTheme.inactiveTitleTextColor; } f.Invalidate(); - foreach (Control c in f.Controls) c.Invalidate(); + ((WinClassic)f).programContent.Invalidate(); + ((WinClassic)f).top.Invalidate(); + ((WinClassic)f).toprightcorner.Invalidate(); + ((WinClassic)f).right.Invalidate(); + ((WinClassic)f).bottomrightcorner.Invalidate(); + ((WinClassic)f).bottom.Invalidate(); + ((WinClassic)f).bottomleftcorner.Invalidate(); + ((WinClassic)f).left.Invalidate(); + ((WinClassic)f).topleftcorner.Invalidate(); + foreach (Control c in ((WinClassic)f).progContent.Controls) c.Invalidate(); + ((WinClassic)f).progContent.BackColor = SaveSystem.currentTheme.threeDObjectsColor; } } ParentForm.Close(); -- cgit v1.2.3 From d2c331962d3d102022f41b8c7d449e85767b2d35 Mon Sep 17 00:00:00 2001 From: lempamo Date: Tue, 5 Sep 2017 22:19:07 -0400 Subject: taskbar now affected by theme change --- Histacom2/OS/Win95/Win95.Designer.cs | 134 +++++++++++---------- Histacom2/OS/Win95/Win95.cs | 25 ++++ Histacom2/OS/Win95/Win95.resx | 37 +++--- .../OS/Win95/Win95Apps/WinClassicThemePanel.cs | 58 ++------- .../WinClassic/WinClassicDisplayExample.png | Bin 1353 -> 1838 bytes 5 files changed, 122 insertions(+), 132 deletions(-) (limited to 'Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs') diff --git a/Histacom2/OS/Win95/Win95.Designer.cs b/Histacom2/OS/Win95/Win95.Designer.cs index 40f40ca..f08b474 100644 --- a/Histacom2/OS/Win95/Win95.Designer.cs +++ b/Histacom2/OS/Win95/Win95.Designer.cs @@ -152,6 +152,7 @@ namespace Histacom2.OS.Win95 this.taskbar.Name = "taskbar"; this.taskbar.Size = new System.Drawing.Size(640, 28); this.taskbar.TabIndex = 2; + this.taskbar.Paint += new System.Windows.Forms.PaintEventHandler(this.taskbar_Paint); // // clockPanel // @@ -162,6 +163,7 @@ namespace Histacom2.OS.Win95 this.clockPanel.Name = "clockPanel"; this.clockPanel.Size = new System.Drawing.Size(65, 28); this.clockPanel.TabIndex = 4; + this.clockPanel.Paint += new System.Windows.Forms.PaintEventHandler(this.clockPanel_Paint); // // taskbartime // @@ -223,7 +225,7 @@ namespace Histacom2.OS.Win95 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, 311); + this.startmenuitems.Size = new System.Drawing.Size(148, 292); this.startmenuitems.TabIndex = 0; this.startmenuitems.Text = "StartMenu"; // @@ -252,7 +254,7 @@ namespace Histacom2.OS.Win95 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 @@ -277,7 +279,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(181, 28); + this.AccessoriesToolStripMenuItem.Size = new System.Drawing.Size(186, 28); this.AccessoriesToolStripMenuItem.Text = "Accessories"; // // CommunicationsToolStripMenuItem @@ -291,7 +293,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(181, 28); + this.CommunicationsToolStripMenuItem.Size = new System.Drawing.Size(188, 28); this.CommunicationsToolStripMenuItem.Text = "Communications"; // // InternetConnectionWizardToolStripMenuItem @@ -302,7 +304,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(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); // @@ -314,7 +316,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(219, 22); + this.NetMeetingToolStripMenuItem.Size = new System.Drawing.Size(229, 22); this.NetMeetingToolStripMenuItem.Text = "NetMeeting"; this.NetMeetingToolStripMenuItem.Click += new System.EventHandler(this.WebChatToolStripMenuItem_Click); // @@ -331,7 +333,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(181, 28); + this.MultimediaToolStripMenuItem.Size = new System.Drawing.Size(188, 28); this.MultimediaToolStripMenuItem.Text = "Multimedia"; // // CDPlayerToolStripMenuItem @@ -342,7 +344,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(194, 22); + this.CDPlayerToolStripMenuItem.Size = new System.Drawing.Size(201, 22); this.CDPlayerToolStripMenuItem.Text = "CD Player"; // // SoundRecorderToolStripMenuItem @@ -353,7 +355,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(194, 22); + this.SoundRecorderToolStripMenuItem.Size = new System.Drawing.Size(201, 22); this.SoundRecorderToolStripMenuItem.Text = "Sound Recorder"; // // VolumeControlToolStripMenuItem @@ -364,7 +366,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(194, 22); + this.VolumeControlToolStripMenuItem.Size = new System.Drawing.Size(201, 22); this.VolumeControlToolStripMenuItem.Text = "Volume Control"; // // WindowsMediaPlayerToolStripMenuItem @@ -375,7 +377,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(194, 22); + this.WindowsMediaPlayerToolStripMenuItem.Size = new System.Drawing.Size(201, 22); this.WindowsMediaPlayerToolStripMenuItem.Text = "Windows Media Player"; // // toolStripMenuItem1 @@ -389,7 +391,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(181, 28); + this.toolStripMenuItem1.Size = new System.Drawing.Size(188, 28); this.toolStripMenuItem1.Text = "System Tools"; // // toolStripMenuItem2 @@ -400,7 +402,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(172, 22); + this.toolStripMenuItem2.Size = new System.Drawing.Size(181, 22); this.toolStripMenuItem2.Text = "Disk Defragmenter"; // // toolStripMenuItem3 @@ -411,7 +413,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(172, 22); + this.toolStripMenuItem3.Size = new System.Drawing.Size(181, 22); this.toolStripMenuItem3.Text = "ScanDisk"; // // GamesToolStripMenuItem @@ -424,7 +426,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(181, 28); + this.GamesToolStripMenuItem.Size = new System.Drawing.Size(188, 28); this.GamesToolStripMenuItem.Text = "Games"; // // MinsweeperToolStripMenuItem @@ -434,7 +436,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(144, 22); + this.MinsweeperToolStripMenuItem.Size = new System.Drawing.Size(150, 22); this.MinsweeperToolStripMenuItem.Text = "Minesweeper"; this.MinsweeperToolStripMenuItem.Click += new System.EventHandler(this.MinsweeperToolStripMenuItem_Click); // @@ -446,7 +448,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(181, 28); + this.CalculatorToolStripMenuItem.Size = new System.Drawing.Size(188, 28); this.CalculatorToolStripMenuItem.Text = "Calculator"; this.CalculatorToolStripMenuItem.Click += new System.EventHandler(this.CalculatorToolStripMenuItem_Click); // @@ -458,7 +460,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(181, 28); + this.HyperTerminalToolStripMenuItem.Size = new System.Drawing.Size(188, 28); this.HyperTerminalToolStripMenuItem.Text = "HyperTerminal"; // // ImagingToolStripMenuItem @@ -469,7 +471,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(181, 28); + this.ImagingToolStripMenuItem.Size = new System.Drawing.Size(188, 28); this.ImagingToolStripMenuItem.Text = "Imaging"; // // NotePadToolStripMenuItem @@ -480,7 +482,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(181, 28); + this.NotePadToolStripMenuItem.Size = new System.Drawing.Size(188, 28); this.NotePadToolStripMenuItem.Text = "Notepad"; this.NotePadToolStripMenuItem.Click += new System.EventHandler(this.NotePadToolStripMenuItem_Click); // @@ -492,7 +494,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(181, 28); + this.OnlineRegistrationToolStripMenuItem.Size = new System.Drawing.Size(188, 28); this.OnlineRegistrationToolStripMenuItem.Text = "Online Registration"; // // PaintToolStripMenuItem @@ -503,7 +505,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(181, 28); + this.PaintToolStripMenuItem.Size = new System.Drawing.Size(188, 28); this.PaintToolStripMenuItem.Text = "Paintbrush"; // // PhoneDialerToolStripMenuItem @@ -514,7 +516,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(181, 28); + this.PhoneDialerToolStripMenuItem.Size = new System.Drawing.Size(188, 28); this.PhoneDialerToolStripMenuItem.Text = "Phone Dialer"; // // WordPadToolStripMenuItem @@ -525,7 +527,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(181, 28); + this.WordPadToolStripMenuItem.Size = new System.Drawing.Size(188, 28); this.WordPadToolStripMenuItem.Text = "WordPad"; this.WordPadToolStripMenuItem.Click += new System.EventHandler(this.WordPadToolStripMenuItem_Click); // @@ -543,7 +545,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(181, 28); + this.StartUpToolStripMenuItem.Size = new System.Drawing.Size(186, 28); this.StartUpToolStripMenuItem.Text = "Online Services"; // // AOLInternetFREETrialToolStripMenuItem @@ -553,7 +555,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(241, 22); + this.AOLInternetFREETrialToolStripMenuItem.Size = new System.Drawing.Size(248, 22); this.AOLInternetFREETrialToolStripMenuItem.Text = "AOL & Internet FREE Trial!"; // // ATTWorldNetSignupToolStripMenuItem @@ -563,7 +565,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(241, 22); + this.ATTWorldNetSignupToolStripMenuItem.Size = new System.Drawing.Size(248, 22); this.ATTWorldNetSignupToolStripMenuItem.Text = "AT&T WorldNet Signup"; // // SetupCompuServe30ToolStripMenuItem @@ -573,7 +575,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(241, 22); + this.SetupCompuServe30ToolStripMenuItem.Size = new System.Drawing.Size(248, 22); this.SetupCompuServe30ToolStripMenuItem.Text = "Setup CompuServe 3.0"; // // SetupWOWFromCompuServeToolStripMenuItem @@ -582,7 +584,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(241, 22); + this.SetupWOWFromCompuServeToolStripMenuItem.Size = new System.Drawing.Size(248, 22); this.SetupWOWFromCompuServeToolStripMenuItem.Text = "Setup WOW! from CompuServe"; // // MSDOSPromptToolStripMenuItem @@ -596,7 +598,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(181, 28); + this.MSDOSPromptToolStripMenuItem.Size = new System.Drawing.Size(186, 28); this.MSDOSPromptToolStripMenuItem.Text = "StartUp"; // // EmptyToolStripMenuItem @@ -605,7 +607,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(116, 22); + this.EmptyToolStripMenuItem.Size = new System.Drawing.Size(118, 22); this.EmptyToolStripMenuItem.Text = "(Empty)"; // // InternetExplorerToolStripMenuItem @@ -617,7 +619,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(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); // @@ -630,7 +632,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(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); // @@ -643,7 +645,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(181, 28); + this.OutlookExpressToolStripMenuItem.Size = new System.Drawing.Size(186, 28); this.OutlookExpressToolStripMenuItem.Text = "Outlook Express"; // // WindowsExplorerToolStripMenuItem1 @@ -655,7 +657,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(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); // @@ -666,7 +668,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(181, 28); + this.GuessTheNumberToolStripMenuItem.Size = new System.Drawing.Size(186, 28); this.GuessTheNumberToolStripMenuItem.Text = "Guess The Number"; this.GuessTheNumberToolStripMenuItem.Visible = false; this.GuessTheNumberToolStripMenuItem.Click += new System.EventHandler(this.GuessTheNumberToolStripMenuItem_Click); @@ -677,7 +679,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(181, 28); + this.StartRunnerToolStripMenuItem.Size = new System.Drawing.Size(186, 28); this.StartRunnerToolStripMenuItem.Text = "Start Runner"; this.StartRunnerToolStripMenuItem.Visible = false; // @@ -687,7 +689,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(181, 28); + this.ErrorBlasterToolStripMenuItem.Size = new System.Drawing.Size(186, 28); this.ErrorBlasterToolStripMenuItem.Text = "Error Blaster"; this.ErrorBlasterToolStripMenuItem.Visible = false; // @@ -697,7 +699,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(181, 28); + this.SkindowsToolStripMenuItem.Size = new System.Drawing.Size(186, 28); this.SkindowsToolStripMenuItem.Text = "Skindows 95"; this.SkindowsToolStripMenuItem.Visible = false; // @@ -708,7 +710,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(181, 28); + this.WebChatToolStripMenuItem.Size = new System.Drawing.Size(186, 28); this.WebChatToolStripMenuItem.Text = "Web Chat"; this.WebChatToolStripMenuItem.Visible = false; this.WebChatToolStripMenuItem.Click += new System.EventHandler(this.WebChatToolStripMenuItem_Click); @@ -720,7 +722,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(181, 28); + this.TimeDistorterToolStripMenuItem.Size = new System.Drawing.Size(186, 28); this.TimeDistorterToolStripMenuItem.Text = "Time Distorter"; this.TimeDistorterToolStripMenuItem.Visible = false; this.TimeDistorterToolStripMenuItem.Click += new System.EventHandler(this.TimeDistorterToolStripMenuItem_Click); @@ -732,7 +734,7 @@ 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(181, 28); + this.FTPClientToolStripMenuItem.Size = new System.Drawing.Size(186, 28); this.FTPClientToolStripMenuItem.Text = "FTP Client"; this.FTPClientToolStripMenuItem.Visible = false; this.FTPClientToolStripMenuItem.Click += new System.EventHandler(this.FTPClientToolStripMenuItem_Click); @@ -750,7 +752,7 @@ namespace Histacom2.OS.Win95 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 @@ -758,7 +760,7 @@ namespace Histacom2.OS.Win95 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); // @@ -767,7 +769,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(159, 22); + this.installerTestToolStripMenuItem.Size = new System.Drawing.Size(165, 22); this.installerTestToolStripMenuItem.Text = "InstallerTest"; this.installerTestToolStripMenuItem.Click += new System.EventHandler(this.installerTestToolStripMenuItem_Click); // @@ -775,7 +777,7 @@ namespace Histacom2.OS.Win95 // 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); // @@ -791,7 +793,7 @@ namespace Histacom2.OS.Win95 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 @@ -801,7 +803,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(146, 22); + this.ControlPanelToolStripMenuItem.Size = new System.Drawing.Size(151, 22); this.ControlPanelToolStripMenuItem.Text = "Control Panel"; // // PrintersToolStripMenuItem @@ -811,7 +813,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(146, 22); + this.PrintersToolStripMenuItem.Size = new System.Drawing.Size(151, 22); this.PrintersToolStripMenuItem.Text = "Printers"; this.PrintersToolStripMenuItem.Click += new System.EventHandler(this.infoboxTestToolStripMenuItem_Click); // @@ -821,7 +823,7 @@ 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(146, 22); + this.TaskbarToolStripMenuItem.Size = new System.Drawing.Size(151, 22); this.TaskbarToolStripMenuItem.Text = "Taskbar"; // // FindToolStripMenuItem @@ -839,7 +841,7 @@ namespace Histacom2.OS.Win95 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 @@ -848,7 +850,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(163, 22); + this.FilesOrFoldersToolStripMenuItem.Size = new System.Drawing.Size(169, 22); this.FilesOrFoldersToolStripMenuItem.Text = "Files or Folders..."; // // ComputerToolStripMenuItem @@ -857,7 +859,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(163, 22); + this.ComputerToolStripMenuItem.Size = new System.Drawing.Size(169, 22); this.ComputerToolStripMenuItem.Text = "Computer..."; // // OnTheInternetToolStripMenuItem @@ -866,7 +868,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(163, 22); + this.OnTheInternetToolStripMenuItem.Size = new System.Drawing.Size(169, 22); this.OnTheInternetToolStripMenuItem.Text = "On the Internet..."; // // PeopleToolStripMenuItem @@ -875,7 +877,7 @@ 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(163, 22); + this.PeopleToolStripMenuItem.Size = new System.Drawing.Size(169, 22); this.PeopleToolStripMenuItem.Text = "People..."; // // HelpToolStripMenuItem @@ -887,7 +889,7 @@ namespace Histacom2.OS.Win95 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 @@ -899,7 +901,7 @@ namespace Histacom2.OS.Win95 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 @@ -910,7 +912,7 @@ namespace Histacom2.OS.Win95 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 @@ -921,7 +923,7 @@ namespace Histacom2.OS.Win95 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); // @@ -993,7 +995,7 @@ namespace Histacom2.OS.Win95 this.PropertiesToolStripMenuItem1}); this.rightclickbackproperties.Name = "ContextMenuStrip1"; this.rightclickbackproperties.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional; - this.rightclickbackproperties.Size = new System.Drawing.Size(128, 70); + this.rightclickbackproperties.Size = new System.Drawing.Size(135, 70); // // NewToolStripMenuItem1 // @@ -1002,14 +1004,14 @@ namespace Histacom2.OS.Win95 this.FolderToolStripMenuItem, this.TextDocumentToolStripMenuItem}); this.NewToolStripMenuItem1.Name = "NewToolStripMenuItem1"; - this.NewToolStripMenuItem1.Size = new System.Drawing.Size(127, 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); // @@ -1017,7 +1019,7 @@ namespace Histacom2.OS.Win95 // 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); // @@ -1025,7 +1027,7 @@ namespace Histacom2.OS.Win95 // this.deleteToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.deleteToolStripMenuItem.Name = "deleteToolStripMenuItem"; - this.deleteToolStripMenuItem.Size = new System.Drawing.Size(127, 22); + this.deleteToolStripMenuItem.Size = new System.Drawing.Size(134, 22); this.deleteToolStripMenuItem.Text = "Delete"; this.deleteToolStripMenuItem.Click += new System.EventHandler(this.deleteToolStripMenuItem_Click); // @@ -1033,7 +1035,7 @@ namespace Histacom2.OS.Win95 // this.PropertiesToolStripMenuItem1.BackColor = System.Drawing.Color.Silver; this.PropertiesToolStripMenuItem1.Name = "PropertiesToolStripMenuItem1"; - this.PropertiesToolStripMenuItem1.Size = new System.Drawing.Size(127, 22); + this.PropertiesToolStripMenuItem1.Size = new System.Drawing.Size(134, 22); this.PropertiesToolStripMenuItem1.Text = "Properties"; this.PropertiesToolStripMenuItem1.Click += new System.EventHandler(this.PropertiesToolStripMenuItem1_Click); // @@ -1139,7 +1141,6 @@ namespace Histacom2.OS.Win95 internal System.Windows.Forms.PictureBox osimage; internal System.Windows.Forms.ToolStripMenuItem ShutdownToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem SuspendToolStripMenuItem; - private System.Windows.Forms.Panel clockPanel; private System.Windows.Forms.Timer clockTimer; private System.Windows.Forms.ImageList desktopImages; internal System.Windows.Forms.ListView desktopicons; @@ -1159,5 +1160,6 @@ namespace Histacom2.OS.Win95 internal System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1; internal System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2; internal System.Windows.Forms.ToolStripMenuItem toolStripMenuItem3; + public System.Windows.Forms.Panel clockPanel; } } \ No newline at end of file diff --git a/Histacom2/OS/Win95/Win95.cs b/Histacom2/OS/Win95/Win95.cs index 25bc348..8188b7e 100644 --- a/Histacom2/OS/Win95/Win95.cs +++ b/Histacom2/OS/Win95/Win95.cs @@ -606,6 +606,31 @@ namespace Histacom2.OS.Win95 app.BringToFront(); startmenu.Hide(); } + + private void taskbar_Paint(object sender, PaintEventArgs e) + { + var gfx = e.Graphics; + gfx.Clear(currentTheme.threeDObjectsColor); + + var _lightBack = Paintbrush.GetLightFromColor(currentTheme.threeDObjectsColor); + + gfx.DrawLine(new Pen(_lightBack), 0, 1, taskbar.Width, 1); + } + + private void clockPanel_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(new Pen(_lightBack), 0, 1, clockPanel.Width, 1); + gfx.DrawLine(new Pen(_darkBack), 0, 24, 0, 4); + gfx.DrawLine(new Pen(_darkBack), 61, 4, 0, 4); + gfx.DrawLine(new Pen(_lightBack), 62, 4, 62, 25); + gfx.DrawLine(new Pen(_lightBack), 0, 25, 62, 25); + } } public class MyRenderer : ToolStripProfessionalRenderer { diff --git a/Histacom2/OS/Win95/Win95.resx b/Histacom2/OS/Win95/Win95.resx index 419e624..f0d544c 100644 --- a/Histacom2/OS/Win95/Win95.resx +++ b/Histacom2/OS/Win95/Win95.resx @@ -120,6 +120,9 @@ 17, 17 + + 17, 17 + @@ -188,7 +191,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACmSURBVDhPnZFR + vgAADr4B6kKxwAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACmSURBVDhPnZFR EsQgCEM9ukfzZl0CREmrO7uNw0ghL360ndR7v7L9X4BfBxDeVVrOmsaLQqd1DKowK7QmYwxvza4hC66H UpiV6IJlm+UQOnvxvg7aBAPkIWpY87rICtpkX/4SX5MgmkvnxzD4JIC3BCUGzZCEfWb9I4D3M2gDp3xY oXsQ9vRAYAJVbYNqAARf2M+aQa3Hr2QAdmH5TTPoDVz1BW7tA7ajvYP7sMmIAAAAAElFTkSuQmCC @@ -223,7 +226,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACzSURBVDhPhZJR + vgAADr4B6kKxwAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACzSURBVDhPhZJR EsUgCAN7dI7mzawRl1KLU2fygMimfryr9/6rcUY53FVmluDWmpoxFveViQSZuU4h72GMyMwm5AF2DPnA QPTM9FIOCTiMBarSI1712qeZwwbkkApejBuqLLK8h7Cb5T8HGI8QBLPq8+wdzr722FUNL7+gEsuE06MI qELk6T7DOhNcwTNAcuMJAZYAdQgiJAIk/kAZdr8OmCHD+5UWeRkBfKgEduUAYL/r1w0ie5EGNPvMCQAA @@ -261,7 +264,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAJVJREFUOE+VkQsSxCAMQj16bu4GFU3YdO2+Gaqi0F/7j96zfqKHqYiuByYBFfYJ + wQAADsEBuJFr7QAAAJVJREFUOE+VkQsSxCAMQj16bu4GFU3YdO2+Gaqi0F/7j96zfqKHqYiuByYBFfYJ 1okT9uuef4slmG9gWjdzN4Wnf9bRT1RhaCN+KriGieyvkjr8Rl7AMMbywE0zCBiIBS9Awbn7tUD29xME Q0rM8IHhPbziKRhMU0pqjVIfcgHAfB2oiugnuEnG/EkZ/4fLZEksutHaB6sGQO/gf7MbAAAAAElFTkSu QmCC @@ -270,7 +273,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAALtJREFUOE91TwESBCEI6un9vBPRYqljhtEIyUZhzTkXKo8J1ZI4P3xjlAjsqpoN + wQAADsEBuJFr7QAAALtJREFUOE91TwESBCEI6un9vBPRYqljhtEIyUZhzTkXKo8J1ZI4P3xjlAjsqpoN upcBf0zA6+7r8QAxA9170IEPm6l7PWu9A1CLwNaVpSfWNEKLWCECDnkvAdFtMgBDLeHFaNaXEpQu22B9 NsFA96i2yQlo00wejQG9VfuSCQ0IXAFAVAb468AVwJB3AHpsBFKn2uYkemh9hllezf4KcDKwtqkBpX5j Dyj5DRIeDDh3wD3c5AYkh2QwOMYPtAJqglssjE8AAAAASUVORK5CYII= @@ -279,7 +282,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAJVJREFUOE+VkIESgCAIQ/10/pwasJrlkb27nUZsoqPHPbWNlYHCN9gKMTc7O31I + wQAADsEBuJFr7QAAAJVJREFUOE+VkIESgCAIQ/10/pwasJrlkb27nUZsoqPHPbWNlYHCN9gKMTc7O31I gIa0PM2EE32ErE9WNQEw1y6azbZGvkFAhnBcKMmwrQnCVI0MofA+a6UniIDYqKTx7JhBDeVaQd5fVT9m M4JvowbwzjNlu4C5DVBgVyll4Zo8AzrK0gfo6ZBSFq7J6g0+ePWj8EPDD0i7RXV30HOWAAAAAElFTkSu QmCC @@ -288,7 +291,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAJJJREFUOE+tkYEOgCAIRP10/tzk4FISZ7ZuuzDwnq4KJSL1aR/txc21llBfQVbh + wQAADsEBuJFr7QAAAJJJREFUOE+tkYEOgCAIRP10/tzk4FISZ7ZuuzDwnq4KJSL1aR/txc21llBfQVbh EZJZZ5C+nEoEcIN0QDyxLVGzm6WAsMYTvRSSAqaw2jRBloApbJUBhLVub4ABqwMY1poCuEYzhPWjRkgK 6EP7A+obqOc2EzIBeELmtqNFDECI9R3gYmPhCPH+qX6HfAJAQ7iUCwlxft5LSoDNAAAAAElFTkSuQmCC @@ -296,70 +299,70 @@ iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= @@ -374,7 +377,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACO - hAAAAk1TRnQBSQFMAgEBDQEAAUQBAgFEAQIBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA + hAAAAk1TRnQBSQFMAgEBDQEAAVQBAgFUAQIBIAEAASABAAT/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/ diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs index d491eef..f22ee89 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs @@ -61,57 +61,16 @@ namespace Histacom2.OS.Win95.Win95Apps private void applyButton_Click(object sender, EventArgs e) { - switch ((string)comboBox1.SelectedItem) - { - case "Default": - SaveSystem.CurrentSave.ThemeName = "default95"; - SaveSystem.currentTheme = new Default95Theme(); - TitleScreen.frm95.BackgroundImage = null; - TitleScreen.frm95.desktopicons.BackgroundImage = null; - break; - case "Dangerous Creatures": - SaveSystem.CurrentSave.ThemeName = "dangeranimals"; - SaveSystem.currentTheme = new DangerousCreaturesTheme(); - TitleScreen.frm95.BackgroundImage = Properties.Resources.DCTheme_BG; - TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.DCTheme_BG, TitleScreen.frm95.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; - } - foreach (Form f in Application.OpenForms) - { - if (f is WinClassic) - { - if (((WinClassic)f).isActive) - { - ((WinClassic)f).programtopbar.BackColor = SaveSystem.currentTheme.activeTitleBarColor; - ((WinClassic)f).Title.ForeColor = SaveSystem.currentTheme.activeTitleTextColor; - } else - { - ((WinClassic)f).programtopbar.BackColor = SaveSystem.currentTheme.inactiveTitleBarColor; - ((WinClassic)f).Title.ForeColor = SaveSystem.currentTheme.inactiveTitleTextColor; - } - f.Invalidate(); - ((WinClassic)f).programContent.Invalidate(); - ((WinClassic)f).top.Invalidate(); - ((WinClassic)f).toprightcorner.Invalidate(); - ((WinClassic)f).right.Invalidate(); - ((WinClassic)f).bottomrightcorner.Invalidate(); - ((WinClassic)f).bottom.Invalidate(); - ((WinClassic)f).bottomleftcorner.Invalidate(); - ((WinClassic)f).left.Invalidate(); - ((WinClassic)f).topleftcorner.Invalidate(); - foreach (Control c in ((WinClassic)f).progContent.Controls) c.Invalidate(); - ((WinClassic)f).progContent.BackColor = SaveSystem.currentTheme.threeDObjectsColor; - } - } + ChangeTheme(); } private void okButton_Click(object sender, EventArgs e) + { + ChangeTheme(); + ParentForm.Close(); + } + + private void ChangeTheme() { switch ((string)comboBox1.SelectedItem) { @@ -162,7 +121,8 @@ namespace Histacom2.OS.Win95.Win95Apps ((WinClassic)f).progContent.BackColor = SaveSystem.currentTheme.threeDObjectsColor; } } - ParentForm.Close(); + TitleScreen.frm95.taskbar.Invalidate(); + TitleScreen.frm95.clockPanel.Invalidate(); } } } diff --git a/Histacom2/Resources/WinClassic/WinClassicDisplayExample.png b/Histacom2/Resources/WinClassic/WinClassicDisplayExample.png index 63e21df..81eb443 100644 Binary files a/Histacom2/Resources/WinClassic/WinClassicDisplayExample.png and b/Histacom2/Resources/WinClassic/WinClassicDisplayExample.png differ -- 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/OS/Win95/Win95Apps/WinClassicThemePanel.cs') 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