From c69bd70cbf058174df6a51cb528748c4f1c19050 Mon Sep 17 00:00:00 2001 From: FloppyDiskDrive Date: Wed, 13 Sep 2017 18:53:26 -0500 Subject: [PATCH 1/2] UI Cleanup #5 Changed the Start Menu's font to the proper "LeviWindows" font. --- Histacom2/OS/Win95/Win95.cs | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/Histacom2/OS/Win95/Win95.cs b/Histacom2/OS/Win95/Win95.cs index 08ab9df..6c5c761 100644 --- a/Histacom2/OS/Win95/Win95.cs +++ b/Histacom2/OS/Win95/Win95.cs @@ -32,12 +32,32 @@ public partial class Windows95 : Form ListViewItem heldDownItem; Point heldDownPoint; + public static System.Drawing.Text.PrivateFontCollection pfc = new System.Drawing.Text.PrivateFontCollection(); // Init the form public Windows95() { InitializeComponent(); + startmenu.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); + pfc.AddFontFile(DataDirectory + "\\LeviWindows.ttf"); + + ProgramsToolStripMenuItem.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + DocumentsToolStripMenuItem.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + AccessoriesToolStripMenuItem.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + CommunicationsToolStripMenuItem.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + MultimediaToolStripMenuItem.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + GamesToolStripMenuItem.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + StartUpToolStripMenuItem.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + FindToolStripMenuItem.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + ProgramsToolStripMenuItem.DropDown.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + FindToolStripMenuItem.DropDown.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + AccessoriesToolStripMenuItem.DropDown.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + MultimediaToolStripMenuItem.DropDown.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + GamesToolStripMenuItem.DropDown.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + StartUpToolStripMenuItem.DropDown.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + MSDOSPromptToolStripMenuItem.DropDown.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + DocumentsToolStripMenuItem.DropDown.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); ProgramsToolStripMenuItem.DropDown.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); AccessoriesToolStripMenuItem.DropDown.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); CommunicationsToolStripMenuItem.DropDown.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); @@ -60,9 +80,10 @@ public Windows95() item.MouseEnter += new EventHandler(MenuItem_MouseEnter); item.MouseLeave += new EventHandler(MenuItem_MouseLeave); } - } - private void MenuItem_MouseEnter(object sender, EventArgs e) + } + + private void MenuItem_MouseEnter(object sender, EventArgs e) { //((ToolStripMenuItem)sender).ForeColor = Color.White; } From 282cdbca58ef7b4c3decaa942ad20333e3c15cfd Mon Sep 17 00:00:00 2001 From: FloppyDiskDrive Date: Wed, 13 Sep 2017 19:06:37 -0500 Subject: [PATCH 2/2] Revert "UI Cleanup #5" This reverts commit c69bd70cbf058174df6a51cb528748c4f1c19050. --- Histacom2/OS/Win95/Win95.cs | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/Histacom2/OS/Win95/Win95.cs b/Histacom2/OS/Win95/Win95.cs index 6c5c761..08ab9df 100644 --- a/Histacom2/OS/Win95/Win95.cs +++ b/Histacom2/OS/Win95/Win95.cs @@ -32,32 +32,12 @@ public partial class Windows95 : Form ListViewItem heldDownItem; Point heldDownPoint; - public static System.Drawing.Text.PrivateFontCollection pfc = new System.Drawing.Text.PrivateFontCollection(); // Init the form public Windows95() { InitializeComponent(); - startmenu.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); - pfc.AddFontFile(DataDirectory + "\\LeviWindows.ttf"); - - ProgramsToolStripMenuItem.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); - DocumentsToolStripMenuItem.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); - AccessoriesToolStripMenuItem.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); - CommunicationsToolStripMenuItem.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); - MultimediaToolStripMenuItem.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); - GamesToolStripMenuItem.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); - StartUpToolStripMenuItem.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); - FindToolStripMenuItem.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); - ProgramsToolStripMenuItem.DropDown.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); - FindToolStripMenuItem.DropDown.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); - AccessoriesToolStripMenuItem.DropDown.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); - MultimediaToolStripMenuItem.DropDown.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); - GamesToolStripMenuItem.DropDown.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); - StartUpToolStripMenuItem.DropDown.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); - MSDOSPromptToolStripMenuItem.DropDown.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); - DocumentsToolStripMenuItem.DropDown.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); ProgramsToolStripMenuItem.DropDown.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); AccessoriesToolStripMenuItem.DropDown.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); CommunicationsToolStripMenuItem.DropDown.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); @@ -80,10 +60,9 @@ public Windows95() item.MouseEnter += new EventHandler(MenuItem_MouseEnter); item.MouseLeave += new EventHandler(MenuItem_MouseLeave); } + } - } - - private void MenuItem_MouseEnter(object sender, EventArgs e) + private void MenuItem_MouseEnter(object sender, EventArgs e) { //((ToolStripMenuItem)sender).ForeColor = Color.White; }