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 +- TimeHACK.Main/Properties/Resources.Designer.cs | 20 ++ TimeHACK.Main/Properties/Resources.resx | 6 + .../Resources/WinClassic/LauncherSideBar.png | Bin 0 -> 600 bytes .../Resources/WinClassic/Win98SideBar.png | Bin 0 -> 1516 bytes TimeHACK.Main/TimeHACK.Main.csproj | 2 + TimeHACK.Main/TitleScreen.Designer.cs | 326 ++++++++++----------- TimeHACK.Main/TitleScreen.cs | 37 +-- TimeHACK.Main/TitleScreen.resx | 30 +- 9 files changed, 199 insertions(+), 224 deletions(-) create mode 100644 TimeHACK.Main/Resources/WinClassic/LauncherSideBar.png create mode 100644 TimeHACK.Main/Resources/WinClassic/Win98SideBar.png 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); diff --git a/TimeHACK.Main/Properties/Resources.Designer.cs b/TimeHACK.Main/Properties/Resources.Designer.cs index f05a298..9646755 100644 --- a/TimeHACK.Main/Properties/Resources.Designer.cs +++ b/TimeHACK.Main/Properties/Resources.Designer.cs @@ -155,6 +155,16 @@ namespace TimeHACK.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap LauncherSideBar { + get { + object obj = ResourceManager.GetObject("LauncherSideBar", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Byte[]. /// @@ -433,6 +443,16 @@ namespace TimeHACK.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Win98SideBar { + get { + object obj = ResourceManager.GetObject("Win98SideBar", resourceCulture); + return ((System.Drawing.Bitmap)(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 e2ac293..f865599 100644 --- a/TimeHACK.Main/Properties/Resources.resx +++ b/TimeHACK.Main/Properties/Resources.resx @@ -501,4 +501,10 @@ } } + + ..\Resources\WinClassic\Win98SideBar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\WinClassic\LauncherSideBar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/TimeHACK.Main/Resources/WinClassic/LauncherSideBar.png b/TimeHACK.Main/Resources/WinClassic/LauncherSideBar.png new file mode 100644 index 0000000..657666f Binary files /dev/null and b/TimeHACK.Main/Resources/WinClassic/LauncherSideBar.png differ diff --git a/TimeHACK.Main/Resources/WinClassic/Win98SideBar.png b/TimeHACK.Main/Resources/WinClassic/Win98SideBar.png new file mode 100644 index 0000000..5451da3 Binary files /dev/null and b/TimeHACK.Main/Resources/WinClassic/Win98SideBar.png differ diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj index f17eb29..a6e4459 100644 --- a/TimeHACK.Main/TimeHACK.Main.csproj +++ b/TimeHACK.Main/TimeHACK.Main.csproj @@ -413,6 +413,7 @@ + @@ -423,6 +424,7 @@ + diff --git a/TimeHACK.Main/TitleScreen.Designer.cs b/TimeHACK.Main/TitleScreen.Designer.cs index 26861fd..774f7aa 100644 --- a/TimeHACK.Main/TitleScreen.Designer.cs +++ b/TimeHACK.Main/TitleScreen.Designer.cs @@ -33,25 +33,23 @@ this.vmModeTimer = new System.Windows.Forms.Timer(this.components); this.program = new System.Windows.Forms.Panel(); this.programContent = new System.Windows.Forms.Panel(); + this.panel2 = new System.Windows.Forms.Panel(); + this.VM_Height = new System.Windows.Forms.NumericUpDown(); + this.VM_Width = new System.Windows.Forms.NumericUpDown(); + this.vm_mode = new System.Windows.Forms.CheckBox(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.gameversion = new System.Windows.Forms.Label(); + this.startbutton = new System.Windows.Forms.PictureBox(); this.startmenu = new System.Windows.Forms.Panel(); this.startmenuitems = new System.Windows.Forms.MenuStrip(); this.DocumentsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ProgramsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ControlPanelToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.PrintersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.TaskbarToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.HelpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ShutdownToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ossidestartmenu = new System.Windows.Forms.Panel(); this.osimage = new System.Windows.Forms.PictureBox(); - this.panel2 = new System.Windows.Forms.Panel(); - this.VM_Height = new System.Windows.Forms.NumericUpDown(); - this.VM_Width = new System.Windows.Forms.NumericUpDown(); - this.vm_mode = new System.Windows.Forms.CheckBox(); - this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.gameversion = new System.Windows.Forms.Label(); - this.startbutton = new System.Windows.Forms.PictureBox(); + this.pictureBox2 = new System.Windows.Forms.PictureBox(); this.toprightcorner = new System.Windows.Forms.Panel(); this.bottomrightcorner = new System.Windows.Forms.Panel(); this.bottomleftcorner = new System.Windows.Forms.Panel(); @@ -59,15 +57,16 @@ this.updateText = new System.Windows.Forms.Timer(this.components); this.program.SuspendLayout(); this.programContent.SuspendLayout(); - this.startmenu.SuspendLayout(); - this.startmenuitems.SuspendLayout(); - this.ossidestartmenu.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.osimage)).BeginInit(); this.panel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.VM_Height)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.VM_Width)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.startbutton)).BeginInit(); + this.startmenu.SuspendLayout(); + this.startmenuitems.SuspendLayout(); + this.ossidestartmenu.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.osimage)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); this.SuspendLayout(); // // vmModeTimer @@ -85,30 +84,136 @@ this.program.Dock = System.Windows.Forms.DockStyle.Fill; this.program.Location = new System.Drawing.Point(0, 0); this.program.Name = "program"; - this.program.Size = new System.Drawing.Size(800, 600); + this.program.Size = new System.Drawing.Size(800, 450); this.program.TabIndex = 11; // // programContent // this.programContent.BackColor = System.Drawing.Color.Teal; - this.programContent.Controls.Add(this.startmenu); this.programContent.Controls.Add(this.panel2); + this.programContent.Controls.Add(this.startmenu); + this.programContent.Controls.Add(this.pictureBox2); this.programContent.Dock = System.Windows.Forms.DockStyle.Fill; this.programContent.Location = new System.Drawing.Point(0, 0); this.programContent.Name = "programContent"; - this.programContent.Size = new System.Drawing.Size(800, 600); + this.programContent.Size = new System.Drawing.Size(800, 450); this.programContent.TabIndex = 9; // + // panel2 + // + this.panel2.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("panel2.BackgroundImage"))); + this.panel2.Controls.Add(this.VM_Height); + this.panel2.Controls.Add(this.VM_Width); + this.panel2.Controls.Add(this.vm_mode); + this.panel2.Controls.Add(this.pictureBox1); + this.panel2.Controls.Add(this.gameversion); + this.panel2.Controls.Add(this.startbutton); + this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom; + this.panel2.Location = new System.Drawing.Point(0, 422); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(800, 28); + this.panel2.TabIndex = 10; + // + // VM_Height + // + this.VM_Height.Location = new System.Drawing.Point(658, 5); + this.VM_Height.Maximum = new decimal(new int[] { + 2160, + 0, + 0, + 0}); + this.VM_Height.Minimum = new decimal(new int[] { + 480, + 0, + 0, + 0}); + this.VM_Height.Name = "VM_Height"; + this.VM_Height.Size = new System.Drawing.Size(50, 20); + this.VM_Height.TabIndex = 15; + this.VM_Height.Value = new decimal(new int[] { + 480, + 0, + 0, + 0}); + // + // VM_Width + // + this.VM_Width.Location = new System.Drawing.Point(605, 5); + this.VM_Width.Maximum = new decimal(new int[] { + 3840, + 0, + 0, + 0}); + this.VM_Width.Minimum = new decimal(new int[] { + 640, + 0, + 0, + 0}); + this.VM_Width.Name = "VM_Width"; + this.VM_Width.Size = new System.Drawing.Size(50, 20); + this.VM_Width.TabIndex = 14; + this.VM_Width.Value = new decimal(new int[] { + 640, + 0, + 0, + 0}); + // + // vm_mode + // + this.vm_mode.AutoSize = true; + this.vm_mode.BackColor = System.Drawing.Color.Transparent; + this.vm_mode.ForeColor = System.Drawing.Color.Black; + this.vm_mode.Location = new System.Drawing.Point(712, 7); + this.vm_mode.Name = "vm_mode"; + this.vm_mode.Size = new System.Drawing.Size(72, 17); + this.vm_mode.TabIndex = 4; + this.vm_mode.Text = "VM Mode"; + this.vm_mode.UseVisualStyleBackColor = false; + // + // pictureBox1 + // + this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); + this.pictureBox1.Location = new System.Drawing.Point(603, 0); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(187, 28); + this.pictureBox1.TabIndex = 13; + this.pictureBox1.TabStop = false; + // + // gameversion + // + 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.Name = "gameversion"; + this.gameversion.Size = new System.Drawing.Size(78, 13); + this.gameversion.TabIndex = 0; + this.gameversion.Text = "gameversion"; + this.gameversion.Click += new System.EventHandler(this.startbutton_Click); + this.gameversion.MouseLeave += new System.EventHandler(this.gameversion_MouseLeave); + this.gameversion.MouseHover += new System.EventHandler(this.gameversion_MouseHover); + // + // startbutton + // + this.startbutton.Image = ((System.Drawing.Image)(resources.GetObject("startbutton.Image"))); + this.startbutton.Location = new System.Drawing.Point(2, 4); + this.startbutton.Name = "startbutton"; + this.startbutton.Size = new System.Drawing.Size(279, 22); + this.startbutton.TabIndex = 12; + this.startbutton.TabStop = false; + this.startbutton.Click += new System.EventHandler(this.startbutton_Click); + // // startmenu // this.startmenu.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.startmenu.BackColor = System.Drawing.Color.Silver; this.startmenu.Controls.Add(this.startmenuitems); this.startmenu.Controls.Add(this.ossidestartmenu); - this.startmenu.Location = new System.Drawing.Point(0, 283); + this.startmenu.Location = new System.Drawing.Point(0, 238); this.startmenu.Name = "startmenu"; - this.startmenu.Size = new System.Drawing.Size(174, 290); + this.startmenu.Size = new System.Drawing.Size(165, 187); this.startmenu.TabIndex = 11; + this.startmenu.Paint += new System.Windows.Forms.PaintEventHandler(this.startmenu_Paint); // // startmenuitems // @@ -121,12 +226,12 @@ this.HelpToolStripMenuItem, this.ShutdownToolStripMenuItem}); this.startmenuitems.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.VerticalStackWithOverflow; - this.startmenuitems.Location = new System.Drawing.Point(28, 2); + this.startmenuitems.Location = new System.Drawing.Point(23, 2); this.startmenuitems.Margin = new System.Windows.Forms.Padding(0, 0, 5, 0); this.startmenuitems.Name = "startmenuitems"; - this.startmenuitems.Padding = new System.Windows.Forms.Padding(6, 2, 0, 0); + this.startmenuitems.Padding = new System.Windows.Forms.Padding(4, 2, 0, 0); this.startmenuitems.RenderMode = System.Windows.Forms.ToolStripRenderMode.System; - this.startmenuitems.Size = new System.Drawing.Size(145, 184); + this.startmenuitems.Size = new System.Drawing.Size(143, 184); this.startmenuitems.TabIndex = 0; this.startmenuitems.Text = "StartMenu"; // @@ -134,7 +239,7 @@ // this.DocumentsToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.DocumentsToolStripMenuItem.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver; - this.DocumentsToolStripMenuItem.Image = global::TimeHACK.Properties.Resources.WinClassicDocuments; + this.DocumentsToolStripMenuItem.Image = global::TimeHACK.Properties.Resources.WinClassicPrograms; this.DocumentsToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.DocumentsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.DocumentsToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Silver; @@ -149,7 +254,7 @@ this.ProgramsToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.ProgramsToolStripMenuItem.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver; this.ProgramsToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.ProgramsToolStripMenuItem.Image = global::TimeHACK.Properties.Resources.WinClassicPrograms; + this.ProgramsToolStripMenuItem.Image = global::TimeHACK.Properties.Resources.WinClassicDocuments; this.ProgramsToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.ProgramsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.ProgramsToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Silver; @@ -162,10 +267,6 @@ // SettingsToolStripMenuItem // this.SettingsToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.SettingsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.ControlPanelToolStripMenuItem, - this.PrintersToolStripMenuItem, - this.TaskbarToolStripMenuItem}); this.SettingsToolStripMenuItem.Image = global::TimeHACK.Properties.Resources.WinClassicSettings; this.SettingsToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.SettingsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; @@ -175,33 +276,6 @@ this.SettingsToolStripMenuItem.Size = new System.Drawing.Size(138, 36); this.SettingsToolStripMenuItem.Text = "Settings"; // - // ControlPanelToolStripMenuItem - // - this.ControlPanelToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.ControlPanelToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("ControlPanelToolStripMenuItem.BackgroundImage"))); - this.ControlPanelToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; - this.ControlPanelToolStripMenuItem.Name = "ControlPanelToolStripMenuItem"; - this.ControlPanelToolStripMenuItem.Size = new System.Drawing.Size(146, 22); - this.ControlPanelToolStripMenuItem.Text = "Control Panel"; - // - // PrintersToolStripMenuItem - // - this.PrintersToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.PrintersToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("PrintersToolStripMenuItem.BackgroundImage"))); - this.PrintersToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; - this.PrintersToolStripMenuItem.Name = "PrintersToolStripMenuItem"; - this.PrintersToolStripMenuItem.Size = new System.Drawing.Size(146, 22); - this.PrintersToolStripMenuItem.Text = "Printers"; - // - // TaskbarToolStripMenuItem - // - this.TaskbarToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - 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.Text = "Taskbar"; - // // HelpToolStripMenuItem // this.HelpToolStripMenuItem.BackColor = System.Drawing.Color.Silver; @@ -231,125 +305,33 @@ // ossidestartmenu // this.ossidestartmenu.Controls.Add(this.osimage); - this.ossidestartmenu.Location = new System.Drawing.Point(0, 0); + this.ossidestartmenu.Location = new System.Drawing.Point(2, 2); this.ossidestartmenu.Name = "ossidestartmenu"; - this.ossidestartmenu.Size = new System.Drawing.Size(26, 297); + this.ossidestartmenu.Size = new System.Drawing.Size(21, 184); this.ossidestartmenu.TabIndex = 4; // // osimage // this.osimage.BackColor = System.Drawing.Color.Gray; this.osimage.Dock = System.Windows.Forms.DockStyle.Fill; + this.osimage.Image = global::TimeHACK.Properties.Resources.LauncherSideBar; this.osimage.Location = new System.Drawing.Point(0, 0); this.osimage.Name = "osimage"; - this.osimage.Size = new System.Drawing.Size(26, 297); + this.osimage.Size = new System.Drawing.Size(21, 184); this.osimage.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.osimage.TabIndex = 0; this.osimage.TabStop = false; // - // panel2 - // - this.panel2.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("panel2.BackgroundImage"))); - this.panel2.Controls.Add(this.VM_Height); - this.panel2.Controls.Add(this.VM_Width); - this.panel2.Controls.Add(this.vm_mode); - this.panel2.Controls.Add(this.pictureBox1); - this.panel2.Controls.Add(this.gameversion); - this.panel2.Controls.Add(this.startbutton); - this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel2.Location = new System.Drawing.Point(0, 572); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(800, 28); - this.panel2.TabIndex = 10; - // - // VM_Height - // - this.VM_Height.Location = new System.Drawing.Point(658, 5); - this.VM_Height.Maximum = new decimal(new int[] { - 2160, - 0, - 0, - 0}); - this.VM_Height.Minimum = new decimal(new int[] { - 480, - 0, - 0, - 0}); - this.VM_Height.Name = "VM_Height"; - this.VM_Height.Size = new System.Drawing.Size(50, 20); - this.VM_Height.TabIndex = 15; - this.VM_Height.Value = new decimal(new int[] { - 480, - 0, - 0, - 0}); + // pictureBox2 // - // VM_Width - // - this.VM_Width.Location = new System.Drawing.Point(605, 5); - this.VM_Width.Maximum = new decimal(new int[] { - 3840, - 0, - 0, - 0}); - this.VM_Width.Minimum = new decimal(new int[] { - 640, - 0, - 0, - 0}); - this.VM_Width.Name = "VM_Width"; - this.VM_Width.Size = new System.Drawing.Size(50, 20); - this.VM_Width.TabIndex = 14; - this.VM_Width.Value = new decimal(new int[] { - 640, - 0, - 0, - 0}); - // - // vm_mode - // - this.vm_mode.AutoSize = true; - this.vm_mode.BackColor = System.Drawing.Color.Transparent; - this.vm_mode.ForeColor = System.Drawing.Color.Black; - this.vm_mode.Location = new System.Drawing.Point(712, 7); - this.vm_mode.Name = "vm_mode"; - this.vm_mode.Size = new System.Drawing.Size(72, 17); - this.vm_mode.TabIndex = 4; - this.vm_mode.Text = "VM Mode"; - this.vm_mode.UseVisualStyleBackColor = false; - // - // pictureBox1 - // - this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); - this.pictureBox1.Location = new System.Drawing.Point(603, 0); - this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(187, 28); - this.pictureBox1.TabIndex = 13; - this.pictureBox1.TabStop = false; - // - // gameversion - // - 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.Name = "gameversion"; - this.gameversion.Size = new System.Drawing.Size(78, 13); - this.gameversion.TabIndex = 0; - this.gameversion.Text = "gameversion"; - this.gameversion.Click += new System.EventHandler(this.startbutton_Click); - this.gameversion.MouseLeave += new System.EventHandler(this.gameversion_MouseLeave); - this.gameversion.MouseHover += new System.EventHandler(this.gameversion_MouseHover); - // - // startbutton - // - this.startbutton.Image = ((System.Drawing.Image)(resources.GetObject("startbutton.Image"))); - this.startbutton.Location = new System.Drawing.Point(2, 4); - this.startbutton.Name = "startbutton"; - this.startbutton.Size = new System.Drawing.Size(279, 22); - this.startbutton.TabIndex = 12; - this.startbutton.TabStop = false; - this.startbutton.Click += new System.EventHandler(this.startbutton_Click); + this.pictureBox2.BackColor = System.Drawing.Color.Transparent; + this.pictureBox2.Image = global::TimeHACK.Properties.Resources.TimeHACK_Logo; + this.pictureBox2.Location = new System.Drawing.Point(29, 12); + this.pictureBox2.Name = "pictureBox2"; + this.pictureBox2.Size = new System.Drawing.Size(755, 350); + this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pictureBox2.TabIndex = 12; + this.pictureBox2.TabStop = false; // // toprightcorner // @@ -365,7 +347,7 @@ this.bottomrightcorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.bottomrightcorner.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("bottomrightcorner.BackgroundImage"))); this.bottomrightcorner.Cursor = System.Windows.Forms.Cursors.SizeNWSE; - this.bottomrightcorner.Location = new System.Drawing.Point(796, 596); + this.bottomrightcorner.Location = new System.Drawing.Point(796, 446); this.bottomrightcorner.Name = "bottomrightcorner"; this.bottomrightcorner.Size = new System.Drawing.Size(4, 4); this.bottomrightcorner.TabIndex = 4; @@ -374,7 +356,7 @@ // this.bottomleftcorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.bottomleftcorner.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("bottomleftcorner.BackgroundImage"))); - this.bottomleftcorner.Location = new System.Drawing.Point(0, 596); + this.bottomleftcorner.Location = new System.Drawing.Point(0, 446); this.bottomleftcorner.Name = "bottomleftcorner"; this.bottomleftcorner.Size = new System.Drawing.Size(4, 4); this.bottomleftcorner.TabIndex = 2; @@ -397,27 +379,27 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.Teal; - this.ClientSize = new System.Drawing.Size(800, 600); + this.ClientSize = new System.Drawing.Size(800, 400); this.Controls.Add(this.program); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.Name = "TitleScreen"; this.Tag = "ignoreFormOnTaskbar"; this.Text = "TimeHACK Launcher"; this.Load += new System.EventHandler(this.TitleScreen_Load); this.program.ResumeLayout(false); this.programContent.ResumeLayout(false); - this.startmenu.ResumeLayout(false); - this.startmenu.PerformLayout(); - this.startmenuitems.ResumeLayout(false); - this.startmenuitems.PerformLayout(); - this.ossidestartmenu.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.osimage)).EndInit(); this.panel2.ResumeLayout(false); this.panel2.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.VM_Height)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.VM_Width)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.startbutton)).EndInit(); + this.startmenu.ResumeLayout(false); + this.startmenu.PerformLayout(); + this.startmenuitems.ResumeLayout(false); + this.startmenuitems.PerformLayout(); + this.ossidestartmenu.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.osimage)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); this.ResumeLayout(false); } @@ -435,9 +417,6 @@ internal System.Windows.Forms.ToolStripMenuItem DocumentsToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem ProgramsToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem SettingsToolStripMenuItem; - internal System.Windows.Forms.ToolStripMenuItem ControlPanelToolStripMenuItem; - internal System.Windows.Forms.ToolStripMenuItem PrintersToolStripMenuItem; - internal System.Windows.Forms.ToolStripMenuItem TaskbarToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem HelpToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem ShutdownToolStripMenuItem; internal System.Windows.Forms.Panel ossidestartmenu; @@ -450,5 +429,6 @@ public System.Windows.Forms.Label gameversion; internal System.Windows.Forms.PictureBox startbutton; private System.Windows.Forms.Timer updateText; + private System.Windows.Forms.PictureBox pictureBox2; } } \ No newline at end of file diff --git a/TimeHACK.Main/TitleScreen.cs b/TimeHACK.Main/TitleScreen.cs index 0e01d4c..d23c1d3 100644 --- a/TimeHACK.Main/TitleScreen.cs +++ b/TimeHACK.Main/TitleScreen.cs @@ -18,8 +18,6 @@ namespace TimeHACK { public static System.Drawing.Text.PrivateFontCollection pfc = new System.Drawing.Text.PrivateFontCollection(); - TimeHACK.Engine.Template.WinClassic borders = new TimeHACK.Engine.Template.WinClassic(); - public static Windows95 frm95; public static Windows98 frm98; public static string username; @@ -48,28 +46,16 @@ namespace TimeHACK public TitleScreen() { InitializeComponent(); + } - // Add the WINDOWS BORDERS from the Window Manager - - FieldInfo f1 = typeof(Control).GetField("EventMouseDown", - BindingFlags.Static | BindingFlags.NonPublic); - object obj = f1.GetValue(borders.programtopbar); - PropertyInfo pi = borders.programtopbar.GetType().GetProperty("Events", - BindingFlags.NonPublic | BindingFlags.Instance); - EventHandlerList list = (EventHandlerList)pi.GetValue(borders.programtopbar, null); - list.RemoveHandler(obj, list[obj]); - - borders.programtopbar.MouseDown += new MouseEventHandler(TitleBarDrag); - borders.programtopbar.Controls.Find("closebutton", false)[0].MouseClick += new MouseEventHandler(closeButton); - borders.programtopbar.Controls.Find("maximizebutton", false)[0].MouseClick += new MouseEventHandler(MaximiseButton); - - this.Controls.Add(borders.programtopbar); - this.Controls.Add(borders.top); - this.Controls.Add(borders.right); - this.Controls.Add(borders.left); - this.Controls.Add(borders.bottom); - - + 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() @@ -199,6 +185,11 @@ namespace TimeHACK pfc.AddFontFile(Data + "\\LeviWindows.ttf"); pfc.AddFontFile(Data + "\\windows_command_prompt.ttf"); gameversion.Font = new Font(pfc.Families[0], 16F, FontStyle.Bold, GraphicsUnit.Point, (0)); + 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))); + SettingsToolStripMenuItem.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + HelpToolStripMenuItem.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + ShutdownToolStripMenuItem.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); // Start the VM Mode timer vmModeTimer.Start(); diff --git a/TimeHACK.Main/TitleScreen.resx b/TimeHACK.Main/TitleScreen.resx index 9d7a9cb..1deb438 100644 --- a/TimeHACK.Main/TitleScreen.resx +++ b/TimeHACK.Main/TitleScreen.resx @@ -120,34 +120,7 @@ 17, 17 - - 153, 17 - - - 153, 17 - - - - iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw - 4AAABIQCQUtXaBsAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw - 4AAABIQCQUtXaBsAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw - 4AAABIQCQUtXaBsAAAAASUVORK5CYII= - - iVBORw0KGgoAAAANSUhEUgAAAAMAAAAcCAIAAAArypKmAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -174,6 +147,9 @@ tdwAAAAASUVORK5CYII= + + 153, 17 + iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAIAAAAmkwkpAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO -- 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 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(-) 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(-) 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(-) 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 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 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