From 4af9777601e85fa948bf2e246798f60f6eae2f49 Mon Sep 17 00:00:00 2001 From: lempamo Date: Sat, 1 Jul 2017 15:49:09 -0400 Subject: improved launcher --- TimeHACK.Main/OS/Win98/Win98.Designer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'TimeHACK.Main/OS') diff --git a/TimeHACK.Main/OS/Win98/Win98.Designer.cs b/TimeHACK.Main/OS/Win98/Win98.Designer.cs index 255a97a..72f6e10 100644 --- a/TimeHACK.Main/OS/Win98/Win98.Designer.cs +++ b/TimeHACK.Main/OS/Win98/Win98.Designer.cs @@ -879,7 +879,7 @@ // osimage // this.osimage.Dock = System.Windows.Forms.DockStyle.Fill; - this.osimage.Image = global::TimeHACK.Properties.Resources.Win95SideBar; + this.osimage.Image = global::TimeHACK.Properties.Resources.Win98SideBar; this.osimage.Location = new System.Drawing.Point(0, 0); this.osimage.Name = "osimage"; this.osimage.Size = new System.Drawing.Size(26, 297); -- cgit v1.2.3 From 311d896ca59155f4a1cd80921cd76c548937367a Mon Sep 17 00:00:00 2001 From: lempamo Date: Sat, 1 Jul 2017 22:36:17 -0400 Subject: paint it black (on the bottom and right) --- TimeHACK.Engine/Paintbrush.cs | 22 ++++++++++++++++++++++ TimeHACK.Engine/TimeHACK.Engine.csproj | 1 + TimeHACK.Main/OS/Win95/Win95.Designer.cs | 2 +- TimeHACK.Main/OS/Win98/Win98.Designer.cs | 1 + TimeHACK.Main/TitleScreen.Designer.cs | 2 +- TimeHACK.Main/TitleScreen.cs | 10 ---------- 6 files changed, 26 insertions(+), 12 deletions(-) create mode 100644 TimeHACK.Engine/Paintbrush.cs (limited to 'TimeHACK.Main/OS') diff --git a/TimeHACK.Engine/Paintbrush.cs b/TimeHACK.Engine/Paintbrush.cs new file mode 100644 index 0000000..2b640cf --- /dev/null +++ b/TimeHACK.Engine/Paintbrush.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace TimeHACK.Engine +{ + public class Paintbrush + { + public static void paintClassicBorders(object sender, PaintEventArgs e, int borderwidth) + { + ControlPaint.DrawBorder(e.Graphics, ((Control)sender).ClientRectangle, + SystemColors.ControlLightLight, borderwidth, ButtonBorderStyle.Outset, + SystemColors.ControlLightLight, borderwidth, ButtonBorderStyle.Outset, + SystemColors.ControlLightLight, borderwidth, ButtonBorderStyle.Outset, + SystemColors.ControlLightLight, borderwidth, ButtonBorderStyle.Outset); + } + } +} diff --git a/TimeHACK.Engine/TimeHACK.Engine.csproj b/TimeHACK.Engine/TimeHACK.Engine.csproj index 7ee8e6e..6a2dba4 100644 --- a/TimeHACK.Engine/TimeHACK.Engine.csproj +++ b/TimeHACK.Engine/TimeHACK.Engine.csproj @@ -49,6 +49,7 @@ + diff --git a/TimeHACK.Main/OS/Win95/Win95.Designer.cs b/TimeHACK.Main/OS/Win95/Win95.Designer.cs index 5a35e3d..f963251 100644 --- a/TimeHACK.Main/OS/Win95/Win95.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95.Designer.cs @@ -223,7 +223,7 @@ namespace TimeHACK.OS.Win95 this.startmenu.Name = "startmenu"; this.startmenu.Size = new System.Drawing.Size(174, 300); this.startmenu.TabIndex = 3; - this.startmenu.Paint += new System.Windows.Forms.PaintEventHandler(this.startmenu_Paint); + this.startmenu.Paint += (sender, args) => Engine.Paintbrush.paintClassicBorders(sender, args, 2); // // startmenuitems // diff --git a/TimeHACK.Main/OS/Win98/Win98.Designer.cs b/TimeHACK.Main/OS/Win98/Win98.Designer.cs index 72f6e10..d1f66dd 100644 --- a/TimeHACK.Main/OS/Win98/Win98.Designer.cs +++ b/TimeHACK.Main/OS/Win98/Win98.Designer.cs @@ -177,6 +177,7 @@ this.startmenu.Name = "startmenu"; this.startmenu.Size = new System.Drawing.Size(174, 300); this.startmenu.TabIndex = 4; + this.startmenu.Paint += (sender, args) => Engine.Paintbrush.paintClassicBorders(sender, args, 2); // // startmenuitems // diff --git a/TimeHACK.Main/TitleScreen.Designer.cs b/TimeHACK.Main/TitleScreen.Designer.cs index 774f7aa..b71f6f3 100644 --- a/TimeHACK.Main/TitleScreen.Designer.cs +++ b/TimeHACK.Main/TitleScreen.Designer.cs @@ -213,7 +213,7 @@ this.startmenu.Name = "startmenu"; this.startmenu.Size = new System.Drawing.Size(165, 187); this.startmenu.TabIndex = 11; - this.startmenu.Paint += new System.Windows.Forms.PaintEventHandler(this.startmenu_Paint); + this.startmenu.Paint += (sender, args) => Engine.Paintbrush.paintClassicBorders(sender, args, 2); // // startmenuitems // diff --git a/TimeHACK.Main/TitleScreen.cs b/TimeHACK.Main/TitleScreen.cs index d23c1d3..54b680f 100644 --- a/TimeHACK.Main/TitleScreen.cs +++ b/TimeHACK.Main/TitleScreen.cs @@ -48,16 +48,6 @@ namespace TimeHACK InitializeComponent(); } - private void startmenu_Paint(object sender, PaintEventArgs e) - { - // Paint the StartMenu - ControlPaint.DrawBorder(e.Graphics, startmenu.ClientRectangle, - SystemColors.ControlLightLight, 2, ButtonBorderStyle.Outset, - SystemColors.ControlLightLight, 2, ButtonBorderStyle.Outset, - SystemColors.ControlLightLight, 2, ButtonBorderStyle.Outset, - SystemColors.ControlLightLight, 2, ButtonBorderStyle.Outset); - } - public void StartGame() { //TODO: You may want to handle story stuff to decide what OS to boot here. -- cgit v1.2.3 From c75aea5a35405b81de4f9ee679ed415cdc0fdeef Mon Sep 17 00:00:00 2001 From: lempamo Date: Sat, 1 Jul 2017 22:49:31 -0400 Subject: a few improved things --- TimeHACK.Engine/Paintbrush.cs | 10 +++++++++- TimeHACK.Main/OS/Win95/Win95.Designer.cs | 2 +- TimeHACK.Main/OS/Win95/Win95.cs | 13 +------------ TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs | 1 + TimeHACK.Main/OS/Win98/Win98.Designer.cs | 2 +- TimeHACK.Main/Program.cs | 6 +++--- TimeHACK.Main/TitleScreen.Designer.cs | 2 +- 7 files changed, 17 insertions(+), 19 deletions(-) (limited to 'TimeHACK.Main/OS') diff --git a/TimeHACK.Engine/Paintbrush.cs b/TimeHACK.Engine/Paintbrush.cs index 2b640cf..9b94ad8 100644 --- a/TimeHACK.Engine/Paintbrush.cs +++ b/TimeHACK.Engine/Paintbrush.cs @@ -10,8 +10,16 @@ namespace TimeHACK.Engine { public class Paintbrush { - public static void paintClassicBorders(object sender, PaintEventArgs e, int borderwidth) + public enum BGStyle { + NoChange, + Silver, + XP + } + + public static void paintClassicBorders(object sender, PaintEventArgs e, int borderwidth, BGStyle bg) + { + ((Control)sender).BackColor = Color.Silver; ControlPaint.DrawBorder(e.Graphics, ((Control)sender).ClientRectangle, SystemColors.ControlLightLight, borderwidth, ButtonBorderStyle.Outset, SystemColors.ControlLightLight, borderwidth, ButtonBorderStyle.Outset, diff --git a/TimeHACK.Main/OS/Win95/Win95.Designer.cs b/TimeHACK.Main/OS/Win95/Win95.Designer.cs index f963251..2a39d34 100644 --- a/TimeHACK.Main/OS/Win95/Win95.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95.Designer.cs @@ -223,7 +223,7 @@ namespace TimeHACK.OS.Win95 this.startmenu.Name = "startmenu"; this.startmenu.Size = new System.Drawing.Size(174, 300); this.startmenu.TabIndex = 3; - this.startmenu.Paint += (sender, args) => Engine.Paintbrush.paintClassicBorders(sender, args, 2); + this.startmenu.Paint += (sender, args) => Engine.Paintbrush.paintClassicBorders(sender, args, 2, Engine.Paintbrush.BGStyle.NoChange); // // startmenuitems // diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs index bd706cb..a991a00 100644 --- a/TimeHACK.Main/OS/Win95/Win95.cs +++ b/TimeHACK.Main/OS/Win95/Win95.cs @@ -16,7 +16,6 @@ namespace TimeHACK.OS.Win95 public partial class Windows95 : Form { private SoundPlayer startsound; - private SoundPlayer stopsound; public WindowManager wm = new WindowManager(); public List nonimportantapps = new List(); @@ -88,22 +87,12 @@ namespace TimeHACK.OS.Win95 #region StartMenu - // Paint StartMenu - private void startmenu_Paint(object sender, PaintEventArgs e) - { - // Paint the StartMenu - ControlPaint.DrawBorder(e.Graphics, startmenu.ClientRectangle, - SystemColors.ControlLightLight, 2, ButtonBorderStyle.Outset, - SystemColors.ControlLightLight, 2, ButtonBorderStyle.Outset, - SystemColors.ControlLightLight, 2, ButtonBorderStyle.Outset, - SystemColors.ControlLightLight, 2, ButtonBorderStyle.Outset); - } - // StartButton Click private void startbutton_Click(object sender, EventArgs e) { startmenu.Show(); startmenu.BringToFront(); + if (taskbar.Visible) taskbar.BringToFront(); } // Shutdown button diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs index cd94306..ec87a18 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs @@ -200,6 +200,7 @@ this.button1.Text = "Login"; this.button1.UseVisualStyleBackColor = true; this.button1.Click += new System.EventHandler(this.Button1_Click); + this.button1.Paint += (sender, args) => Engine.Paintbrush.paintClassicBorders(sender, args, 1, Engine.Paintbrush.BGStyle.Silver); // // txtscreenname // diff --git a/TimeHACK.Main/OS/Win98/Win98.Designer.cs b/TimeHACK.Main/OS/Win98/Win98.Designer.cs index d1f66dd..97ff7bf 100644 --- a/TimeHACK.Main/OS/Win98/Win98.Designer.cs +++ b/TimeHACK.Main/OS/Win98/Win98.Designer.cs @@ -177,7 +177,7 @@ this.startmenu.Name = "startmenu"; this.startmenu.Size = new System.Drawing.Size(174, 300); this.startmenu.TabIndex = 4; - this.startmenu.Paint += (sender, args) => Engine.Paintbrush.paintClassicBorders(sender, args, 2); + this.startmenu.Paint += (sender, args) => Engine.Paintbrush.paintClassicBorders(sender, args, 2, Engine.Paintbrush.BGStyle.NoChange); // // startmenuitems // diff --git a/TimeHACK.Main/Program.cs b/TimeHACK.Main/Program.cs index 72a7291..8411ae8 100644 --- a/TimeHACK.Main/Program.cs +++ b/TimeHACK.Main/Program.cs @@ -80,12 +80,12 @@ namespace TimeHACK public static void ShutdownApplication(System.IO.UnmanagedMemoryStream audio) { - + System.Threading.Thread.Sleep(500); System.IO.Stream audioPlay = audio; stopsound = new System.Media.SoundPlayer(audioPlay); - stopsound.Play(); + stopsound.PlaySync(); - System.Threading.Thread.Sleep(1500); + System.Threading.Thread.Sleep(500); Application.Exit(); } diff --git a/TimeHACK.Main/TitleScreen.Designer.cs b/TimeHACK.Main/TitleScreen.Designer.cs index b71f6f3..a51a0dd 100644 --- a/TimeHACK.Main/TitleScreen.Designer.cs +++ b/TimeHACK.Main/TitleScreen.Designer.cs @@ -213,7 +213,7 @@ this.startmenu.Name = "startmenu"; this.startmenu.Size = new System.Drawing.Size(165, 187); this.startmenu.TabIndex = 11; - this.startmenu.Paint += (sender, args) => Engine.Paintbrush.paintClassicBorders(sender, args, 2); + this.startmenu.Paint += (sender, args) => Engine.Paintbrush.paintClassicBorders(sender, args, 2, Engine.Paintbrush.BGStyle.NoChange); // // startmenuitems // -- cgit v1.2.3 From 82af186d5140e878f6b49bc101112550d36bc78a Mon Sep 17 00:00:00 2001 From: lempamo Date: Sat, 1 Jul 2017 23:02:34 -0400 Subject: classic buttons are here --- TimeHACK.Engine/Paintbrush.cs | 9 +-------- TimeHACK.Main/OS/Win95/Win95.Designer.cs | 2 +- TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs | 5 ++++- TimeHACK.Main/OS/Win98/Win98.Designer.cs | 2 +- TimeHACK.Main/TitleScreen.Designer.cs | 4 ++-- 5 files changed, 9 insertions(+), 13 deletions(-) (limited to 'TimeHACK.Main/OS') diff --git a/TimeHACK.Engine/Paintbrush.cs b/TimeHACK.Engine/Paintbrush.cs index 9b94ad8..b343100 100644 --- a/TimeHACK.Engine/Paintbrush.cs +++ b/TimeHACK.Engine/Paintbrush.cs @@ -10,16 +10,9 @@ namespace TimeHACK.Engine { public class Paintbrush { - public enum BGStyle - { - NoChange, - Silver, - XP - } - public static void paintClassicBorders(object sender, PaintEventArgs e, int borderwidth, BGStyle bg) + public static void paintClassicBorders(object sender, PaintEventArgs e, int borderwidth) { - ((Control)sender).BackColor = Color.Silver; ControlPaint.DrawBorder(e.Graphics, ((Control)sender).ClientRectangle, SystemColors.ControlLightLight, borderwidth, ButtonBorderStyle.Outset, SystemColors.ControlLightLight, borderwidth, ButtonBorderStyle.Outset, diff --git a/TimeHACK.Main/OS/Win95/Win95.Designer.cs b/TimeHACK.Main/OS/Win95/Win95.Designer.cs index 2a39d34..f963251 100644 --- a/TimeHACK.Main/OS/Win95/Win95.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95.Designer.cs @@ -223,7 +223,7 @@ namespace TimeHACK.OS.Win95 this.startmenu.Name = "startmenu"; this.startmenu.Size = new System.Drawing.Size(174, 300); this.startmenu.TabIndex = 3; - this.startmenu.Paint += (sender, args) => Engine.Paintbrush.paintClassicBorders(sender, args, 2, Engine.Paintbrush.BGStyle.NoChange); + this.startmenu.Paint += (sender, args) => Engine.Paintbrush.paintClassicBorders(sender, args, 2); // // startmenuitems // diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs index ec87a18..050e1e3 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs @@ -193,6 +193,8 @@ // // button1 // + this.button1.BackColor = System.Drawing.Color.Silver; + this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button1.Location = new System.Drawing.Point(331, 208); this.button1.Name = "button1"; this.button1.Size = new System.Drawing.Size(151, 23); @@ -200,7 +202,7 @@ this.button1.Text = "Login"; this.button1.UseVisualStyleBackColor = true; this.button1.Click += new System.EventHandler(this.Button1_Click); - this.button1.Paint += (sender, args) => Engine.Paintbrush.paintClassicBorders(sender, args, 1, Engine.Paintbrush.BGStyle.Silver); + this.button1.Paint += (sender, args) => Engine.Paintbrush.paintClassicBorders(sender, args, 2); // // txtscreenname // @@ -237,6 +239,7 @@ this.button2.Text = "Speak"; this.button2.UseVisualStyleBackColor = true; this.button2.Click += new System.EventHandler(this.Button2_Click); + this.button2.Paint += (sender, args) => Engine.Paintbrush.paintClassicBorders(sender, args, 2); // // button3 // diff --git a/TimeHACK.Main/OS/Win98/Win98.Designer.cs b/TimeHACK.Main/OS/Win98/Win98.Designer.cs index 97ff7bf..d1f66dd 100644 --- a/TimeHACK.Main/OS/Win98/Win98.Designer.cs +++ b/TimeHACK.Main/OS/Win98/Win98.Designer.cs @@ -177,7 +177,7 @@ this.startmenu.Name = "startmenu"; this.startmenu.Size = new System.Drawing.Size(174, 300); this.startmenu.TabIndex = 4; - this.startmenu.Paint += (sender, args) => Engine.Paintbrush.paintClassicBorders(sender, args, 2, Engine.Paintbrush.BGStyle.NoChange); + this.startmenu.Paint += (sender, args) => Engine.Paintbrush.paintClassicBorders(sender, args, 2); // // startmenuitems // diff --git a/TimeHACK.Main/TitleScreen.Designer.cs b/TimeHACK.Main/TitleScreen.Designer.cs index a51a0dd..950dfb8 100644 --- a/TimeHACK.Main/TitleScreen.Designer.cs +++ b/TimeHACK.Main/TitleScreen.Designer.cs @@ -184,7 +184,7 @@ this.gameversion.AutoSize = true; this.gameversion.BackColor = System.Drawing.Color.Transparent; this.gameversion.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.gameversion.Location = new System.Drawing.Point(25, 8); + this.gameversion.Location = new System.Drawing.Point(25, 6); this.gameversion.Name = "gameversion"; this.gameversion.Size = new System.Drawing.Size(78, 13); this.gameversion.TabIndex = 0; @@ -213,7 +213,7 @@ this.startmenu.Name = "startmenu"; this.startmenu.Size = new System.Drawing.Size(165, 187); this.startmenu.TabIndex = 11; - this.startmenu.Paint += (sender, args) => Engine.Paintbrush.paintClassicBorders(sender, args, 2, Engine.Paintbrush.BGStyle.NoChange); + this.startmenu.Paint += (sender, args) => Engine.Paintbrush.paintClassicBorders(sender, args, 2); // // startmenuitems // -- cgit v1.2.3 From e8c4c4628daa3f105713f0b1997b4277f62273b4 Mon Sep 17 00:00:00 2001 From: lempamo Date: Sun, 2 Jul 2017 00:13:27 -0400 Subject: better extra buttons and exit --- TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs | 5 +++++ TimeHACK.Main/Program.cs | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'TimeHACK.Main/OS') diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs index 050e1e3..f3d8dde 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs @@ -232,6 +232,8 @@ // // button2 // + this.button2.BackColor = System.Drawing.Color.Silver; + this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button2.Location = new System.Drawing.Point(422, 415); this.button2.Name = "button2"; this.button2.Size = new System.Drawing.Size(71, 23); @@ -243,6 +245,8 @@ // // button3 // + this.button3.BackColor = System.Drawing.Color.Silver; + this.button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button3.Location = new System.Drawing.Point(149, 427); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); @@ -250,6 +254,7 @@ this.button3.Text = "Paul"; this.button3.UseVisualStyleBackColor = true; this.button3.Click += new System.EventHandler(this.Button3_Click); + this.button3.Paint += (sender, args) => Engine.Paintbrush.paintClassicBorders(sender, args, 2); // // button4 // diff --git a/TimeHACK.Main/Program.cs b/TimeHACK.Main/Program.cs index 8411ae8..ea1936f 100644 --- a/TimeHACK.Main/Program.cs +++ b/TimeHACK.Main/Program.cs @@ -86,7 +86,8 @@ namespace TimeHACK stopsound.PlaySync(); System.Threading.Thread.Sleep(500); - Application.Exit(); + Environment.Exit(0); + //Application.Exit(); } public static void GetAppVeyor() -- cgit v1.2.3 From ca190408dc88cbabd443f5d4fc57e048908f47c2 Mon Sep 17 00:00:00 2001 From: lempamo Date: Sun, 2 Jul 2017 10:18:47 -0400 Subject: a few things inb4 font change --- TimeHACK.Main/OS/Win95/Win95.Designer.cs | 1 - TimeHACK.Main/OS/Win95/Win95.cs | 9 +-------- TimeHACK.Main/Properties/Resources.Designer.cs | 20 ++++++++++++++++++++ TimeHACK.Main/Properties/Resources.resx | 6 ++++++ TimeHACK.Main/Resources/SSERIFE.FON | Bin 0 -> 64544 bytes TimeHACK.Main/Resources/VGASYS.FON | Bin 0 -> 7280 bytes 6 files changed, 27 insertions(+), 9 deletions(-) create mode 100644 TimeHACK.Main/Resources/SSERIFE.FON create mode 100644 TimeHACK.Main/Resources/VGASYS.FON (limited to 'TimeHACK.Main/OS') diff --git a/TimeHACK.Main/OS/Win95/Win95.Designer.cs b/TimeHACK.Main/OS/Win95/Win95.Designer.cs index f963251..5e19efa 100644 --- a/TimeHACK.Main/OS/Win95/Win95.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95.Designer.cs @@ -192,7 +192,6 @@ namespace TimeHACK.OS.Win95 this.taskbartime.Size = new System.Drawing.Size(26, 13); this.taskbartime.TabIndex = 2; this.taskbartime.Text = "time"; - this.taskbartime.Click += new System.EventHandler(this.taskbartime_Click); // // taskbarItems // diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs index a991a00..844b597 100644 --- a/TimeHACK.Main/OS/Win95/Win95.cs +++ b/TimeHACK.Main/OS/Win95/Win95.cs @@ -109,12 +109,6 @@ namespace TimeHACK.OS.Win95 desktopicons.Items.Add("New Folder"); } - // Give Year Code - NYI - private void taskbartime_Click(object sender, EventArgs e) - { - //TODO: Set Up Save System - } - // Set the Clock private void clockTimer_Tick(object sender, EventArgs e) { @@ -350,8 +344,7 @@ namespace TimeHACK.OS.Win95 app.BringToFront(); startmenu.Hide(); } - - //TODO: Add Outlook Express 4 + } } diff --git a/TimeHACK.Main/Properties/Resources.Designer.cs b/TimeHACK.Main/Properties/Resources.Designer.cs index 9646755..dfd3be9 100644 --- a/TimeHACK.Main/Properties/Resources.Designer.cs +++ b/TimeHACK.Main/Properties/Resources.Designer.cs @@ -244,6 +244,16 @@ namespace TimeHACK.Properties { } } + /// + /// Looks up a localized resource of type System.Byte[]. + /// + internal static byte[] SSERIFE { + get { + object obj = ResourceManager.GetObject("SSERIFE", resourceCulture); + return ((byte[])(obj)); + } + } + /// /// Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream. /// @@ -354,6 +364,16 @@ namespace TimeHACK.Properties { } } + /// + /// Looks up a localized resource of type System.Byte[]. + /// + internal static byte[] VGASYS { + get { + object obj = ResourceManager.GetObject("VGASYS", resourceCulture); + return ((byte[])(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/TimeHACK.Main/Properties/Resources.resx b/TimeHACK.Main/Properties/Resources.resx index f865599..f6533ec 100644 --- a/TimeHACK.Main/Properties/Resources.resx +++ b/TimeHACK.Main/Properties/Resources.resx @@ -507,4 +507,10 @@ ..\Resources\WinClassic\LauncherSideBar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\resources\sserife.fon;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\resources\vgasys.fon;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/TimeHACK.Main/Resources/SSERIFE.FON b/TimeHACK.Main/Resources/SSERIFE.FON new file mode 100644 index 0000000..a5d342b Binary files /dev/null and b/TimeHACK.Main/Resources/SSERIFE.FON differ diff --git a/TimeHACK.Main/Resources/VGASYS.FON b/TimeHACK.Main/Resources/VGASYS.FON new file mode 100644 index 0000000..8c6d35c Binary files /dev/null and b/TimeHACK.Main/Resources/VGASYS.FON differ -- cgit v1.2.3 From 66eec928d5867d00e57ceed0b211e8c8681b5430 Mon Sep 17 00:00:00 2001 From: lempamo Date: Sun, 2 Jul 2017 10:54:03 -0400 Subject: Revert "a few things inb4 font change" This reverts commit ca190408dc88cbabd443f5d4fc57e048908f47c2. --- TimeHACK.Main/OS/Win95/Win95.Designer.cs | 1 + TimeHACK.Main/OS/Win95/Win95.cs | 9 ++++++++- TimeHACK.Main/Properties/Resources.Designer.cs | 20 -------------------- TimeHACK.Main/Properties/Resources.resx | 6 ------ TimeHACK.Main/Resources/SSERIFE.FON | Bin 64544 -> 0 bytes TimeHACK.Main/Resources/VGASYS.FON | Bin 7280 -> 0 bytes 6 files changed, 9 insertions(+), 27 deletions(-) delete mode 100644 TimeHACK.Main/Resources/SSERIFE.FON delete mode 100644 TimeHACK.Main/Resources/VGASYS.FON (limited to 'TimeHACK.Main/OS') diff --git a/TimeHACK.Main/OS/Win95/Win95.Designer.cs b/TimeHACK.Main/OS/Win95/Win95.Designer.cs index 5e19efa..f963251 100644 --- a/TimeHACK.Main/OS/Win95/Win95.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95.Designer.cs @@ -192,6 +192,7 @@ namespace TimeHACK.OS.Win95 this.taskbartime.Size = new System.Drawing.Size(26, 13); this.taskbartime.TabIndex = 2; this.taskbartime.Text = "time"; + this.taskbartime.Click += new System.EventHandler(this.taskbartime_Click); // // taskbarItems // diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs index 844b597..a991a00 100644 --- a/TimeHACK.Main/OS/Win95/Win95.cs +++ b/TimeHACK.Main/OS/Win95/Win95.cs @@ -109,6 +109,12 @@ namespace TimeHACK.OS.Win95 desktopicons.Items.Add("New Folder"); } + // Give Year Code - NYI + private void taskbartime_Click(object sender, EventArgs e) + { + //TODO: Set Up Save System + } + // Set the Clock private void clockTimer_Tick(object sender, EventArgs e) { @@ -344,7 +350,8 @@ namespace TimeHACK.OS.Win95 app.BringToFront(); startmenu.Hide(); } - + + //TODO: Add Outlook Express 4 } } diff --git a/TimeHACK.Main/Properties/Resources.Designer.cs b/TimeHACK.Main/Properties/Resources.Designer.cs index dfd3be9..9646755 100644 --- a/TimeHACK.Main/Properties/Resources.Designer.cs +++ b/TimeHACK.Main/Properties/Resources.Designer.cs @@ -244,16 +244,6 @@ namespace TimeHACK.Properties { } } - /// - /// Looks up a localized resource of type System.Byte[]. - /// - internal static byte[] SSERIFE { - get { - object obj = ResourceManager.GetObject("SSERIFE", resourceCulture); - return ((byte[])(obj)); - } - } - /// /// Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream. /// @@ -364,16 +354,6 @@ namespace TimeHACK.Properties { } } - /// - /// Looks up a localized resource of type System.Byte[]. - /// - internal static byte[] VGASYS { - get { - object obj = ResourceManager.GetObject("VGASYS", resourceCulture); - return ((byte[])(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/TimeHACK.Main/Properties/Resources.resx b/TimeHACK.Main/Properties/Resources.resx index f6533ec..f865599 100644 --- a/TimeHACK.Main/Properties/Resources.resx +++ b/TimeHACK.Main/Properties/Resources.resx @@ -507,10 +507,4 @@ ..\Resources\WinClassic\LauncherSideBar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\resources\sserife.fon;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\resources\vgasys.fon;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - \ No newline at end of file diff --git a/TimeHACK.Main/Resources/SSERIFE.FON b/TimeHACK.Main/Resources/SSERIFE.FON deleted file mode 100644 index a5d342b..0000000 Binary files a/TimeHACK.Main/Resources/SSERIFE.FON and /dev/null differ diff --git a/TimeHACK.Main/Resources/VGASYS.FON b/TimeHACK.Main/Resources/VGASYS.FON deleted file mode 100644 index 8c6d35c..0000000 Binary files a/TimeHACK.Main/Resources/VGASYS.FON and /dev/null differ -- cgit v1.2.3