From 64d08f8ee9497ae0ef06ad8094080a8897d224a9 Mon Sep 17 00:00:00 2001 From: FloppyDiskDrive Date: Tue, 12 Sep 2017 20:05:57 -0500 Subject: Revert "Various fixes (Bug fix/UI Cleanup #3)" This reverts commit 6d26e57fd4519cea330f51e491bfe54cc347719a. --- Histacom2.Engine/Template/AboutBox95.Designer.cs | 28 ++++++++++++------------ Histacom2.Engine/Template/AboutBox95.cs | 5 ----- Histacom2/OS/Win95/Win95.cs | 4 ---- 3 files changed, 14 insertions(+), 23 deletions(-) diff --git a/Histacom2.Engine/Template/AboutBox95.Designer.cs b/Histacom2.Engine/Template/AboutBox95.Designer.cs index 4b44f9d..359ef3f 100644 --- a/Histacom2.Engine/Template/AboutBox95.Designer.cs +++ b/Histacom2.Engine/Template/AboutBox95.Designer.cs @@ -30,11 +30,11 @@ { this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.textBox1 = new System.Windows.Forms.TextBox(); + this.button1 = new System.Windows.Forms.Button(); this.textBox2 = new System.Windows.Forms.TextBox(); this.pictureBox2 = new System.Windows.Forms.PictureBox(); this.textBox3 = new System.Windows.Forms.Label(); this.textBox4 = new System.Windows.Forms.Label(); - this.classicButton1 = new Histacom2.Engine.UI.ClassicButton(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); this.SuspendLayout(); @@ -59,6 +59,17 @@ this.textBox1.TabIndex = 4; this.textBox1.Text = "@SOFTWARENAME\r\nWindows 95\r\nCopyright © 1981-1995 Microsoft Corp."; // + // button1 + // + this.button1.FlatAppearance.BorderColor = System.Drawing.Color.Silver; + this.button1.Location = new System.Drawing.Point(251, 223); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(75, 23); + this.button1.TabIndex = 0; + this.button1.Text = "OK"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // // textBox2 // this.textBox2.BackColor = System.Drawing.Color.Silver; @@ -98,27 +109,16 @@ this.textBox4.TabIndex = 0; this.textBox4.Text = "System Resources: 97% Free"; // - // classicButton1 - // - this.classicButton1.BackColor = System.Drawing.Color.Silver; - this.classicButton1.ForeColor = System.Drawing.Color.Black; - this.classicButton1.Location = new System.Drawing.Point(251, 220); - this.classicButton1.Name = "classicButton1"; - this.classicButton1.Size = new System.Drawing.Size(75, 23); - this.classicButton1.TabIndex = 6; - this.classicButton1.Text = "OK"; - this.classicButton1.Click += new System.EventHandler(this.classicButton1_Click); - // // AboutBox95 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.Silver; - this.Controls.Add(this.classicButton1); this.Controls.Add(this.textBox4); this.Controls.Add(this.textBox3); this.Controls.Add(this.pictureBox2); this.Controls.Add(this.textBox2); + this.Controls.Add(this.button1); this.Controls.Add(this.textBox1); this.Controls.Add(this.pictureBox1); this.Name = "AboutBox95"; @@ -135,10 +135,10 @@ internal System.Windows.Forms.PictureBox pictureBox1; internal System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.Button button1; internal System.Windows.Forms.TextBox textBox2; private System.Windows.Forms.PictureBox pictureBox2; private System.Windows.Forms.Label textBox3; private System.Windows.Forms.Label textBox4; - private UI.ClassicButton classicButton1; } } diff --git a/Histacom2.Engine/Template/AboutBox95.cs b/Histacom2.Engine/Template/AboutBox95.cs index aca8df5..1accc56 100644 --- a/Histacom2.Engine/Template/AboutBox95.cs +++ b/Histacom2.Engine/Template/AboutBox95.cs @@ -15,10 +15,5 @@ namespace Histacom2.Engine.Template { this.ParentForm.Close(); } - - private void classicButton1_Click(object sender, EventArgs e) - { - this.ParentForm.Close(); - } } } diff --git a/Histacom2/OS/Win95/Win95.cs b/Histacom2/OS/Win95/Win95.cs index 08ab9df..8188b7e 100644 --- a/Histacom2/OS/Win95/Win95.cs +++ b/Histacom2/OS/Win95/Win95.cs @@ -312,10 +312,6 @@ namespace Histacom2.OS.Win95 { //wm.StartInfobox95("Win32 Application", "That is not a valid Win32 Application.", Properties.Resources.Win95Error); } - else if (objListViewItem.Text == "Online Services") - { - wm.StartInfobox95("Caught it!", "If you were to run this, the game would crash!\nLuckily, it won't crash this time!", InfoboxType.Error, InfoboxButtons.OK); - } else { // It is an actual file on the disk -- cgit v1.2.3 From 19d12dd94bcbc7888492ec8dbdea8f21cd5d4fe1 Mon Sep 17 00:00:00 2001 From: FloppyDiskDrive Date: Tue, 12 Sep 2017 20:07:12 -0500 Subject: UI Cleanup #3 Fixed the grammar mistakes in the DevMode message box. --- Histacom2/SaveDialogs/NewGameDialog.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Histacom2/SaveDialogs/NewGameDialog.cs b/Histacom2/SaveDialogs/NewGameDialog.cs index 7609d5d..eb8d44f 100644 --- a/Histacom2/SaveDialogs/NewGameDialog.cs +++ b/Histacom2/SaveDialogs/NewGameDialog.cs @@ -92,8 +92,8 @@ namespace Histacom2 private void btnDevMode_Click(object sender, EventArgs e) { - MessageBox.Show("DevMode is a mode Designed for Development of the game, if you are seeing this that means it is activated! All DevMode does is if a Profile already exists then rather than asking you to choose a different name it just " + - "deletes the old one! This means that you won't have 1 million profiles everytime you want to test something in the game!"); + MessageBox.Show("DevMode (Development Mode) is a special mode that lets you test features without having a large amount of accounts just to test a new feature. How it works is simple:" + + "\n1. It checks for a profile of the same name.\n2. If so, it deletes the profile and starts a new game.\n3. If not, then it starts a new game."); } } } -- cgit v1.2.3 From aa7ec83d57080044ff74ee6dbc03a84af56e3ab9 Mon Sep 17 00:00:00 2001 From: FloppyDiskDrive Date: Tue, 12 Sep 2017 20:15:59 -0500 Subject: UI Cleanup #4 Fixed the AboutInfobox95 UI --- Histacom2.Engine/Template/AboutBox95.Designer.cs | 28 ++++++++++++------------ Histacom2.Engine/Template/AboutBox95.cs | 4 ++-- Histacom2/OS/Win95/Win95.cs | 4 ++++ 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/Histacom2.Engine/Template/AboutBox95.Designer.cs b/Histacom2.Engine/Template/AboutBox95.Designer.cs index 359ef3f..8ad5dea 100644 --- a/Histacom2.Engine/Template/AboutBox95.Designer.cs +++ b/Histacom2.Engine/Template/AboutBox95.Designer.cs @@ -30,11 +30,11 @@ { this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.textBox1 = new System.Windows.Forms.TextBox(); - this.button1 = new System.Windows.Forms.Button(); this.textBox2 = new System.Windows.Forms.TextBox(); this.pictureBox2 = new System.Windows.Forms.PictureBox(); this.textBox3 = new System.Windows.Forms.Label(); this.textBox4 = new System.Windows.Forms.Label(); + this.classicButton1 = new Histacom2.Engine.UI.ClassicButton(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); this.SuspendLayout(); @@ -59,17 +59,6 @@ this.textBox1.TabIndex = 4; this.textBox1.Text = "@SOFTWARENAME\r\nWindows 95\r\nCopyright © 1981-1995 Microsoft Corp."; // - // button1 - // - this.button1.FlatAppearance.BorderColor = System.Drawing.Color.Silver; - this.button1.Location = new System.Drawing.Point(251, 223); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(75, 23); - this.button1.TabIndex = 0; - this.button1.Text = "OK"; - this.button1.UseVisualStyleBackColor = true; - this.button1.Click += new System.EventHandler(this.button1_Click); - // // textBox2 // this.textBox2.BackColor = System.Drawing.Color.Silver; @@ -109,16 +98,27 @@ this.textBox4.TabIndex = 0; this.textBox4.Text = "System Resources: 97% Free"; // + // classicButton1 + // + this.classicButton1.BackColor = System.Drawing.Color.Silver; + this.classicButton1.ForeColor = System.Drawing.Color.Black; + this.classicButton1.Location = new System.Drawing.Point(251, 223); + this.classicButton1.Name = "classicButton1"; + this.classicButton1.Size = new System.Drawing.Size(75, 23); + this.classicButton1.TabIndex = 6; + this.classicButton1.Text = "OK"; + this.classicButton1.Click += new System.EventHandler(this.classicButton1_Click); + // // AboutBox95 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.Silver; + this.Controls.Add(this.classicButton1); this.Controls.Add(this.textBox4); this.Controls.Add(this.textBox3); this.Controls.Add(this.pictureBox2); this.Controls.Add(this.textBox2); - this.Controls.Add(this.button1); this.Controls.Add(this.textBox1); this.Controls.Add(this.pictureBox1); this.Name = "AboutBox95"; @@ -135,10 +135,10 @@ internal System.Windows.Forms.PictureBox pictureBox1; internal System.Windows.Forms.TextBox textBox1; - private System.Windows.Forms.Button button1; internal System.Windows.Forms.TextBox textBox2; private System.Windows.Forms.PictureBox pictureBox2; private System.Windows.Forms.Label textBox3; private System.Windows.Forms.Label textBox4; + private UI.ClassicButton classicButton1; } } diff --git a/Histacom2.Engine/Template/AboutBox95.cs b/Histacom2.Engine/Template/AboutBox95.cs index 1accc56..a97ab1c 100644 --- a/Histacom2.Engine/Template/AboutBox95.cs +++ b/Histacom2.Engine/Template/AboutBox95.cs @@ -11,9 +11,9 @@ namespace Histacom2.Engine.Template this.textBox2.Text = "This product is licensed to:\r\n" + Environment.UserName + "\r\n"; } - private void button1_Click(object sender, EventArgs e) + private void classicButton1_Click(object sender, EventArgs e) { - this.ParentForm.Close(); + ParentForm.Close(); } } } diff --git a/Histacom2/OS/Win95/Win95.cs b/Histacom2/OS/Win95/Win95.cs index 8188b7e..08ab9df 100644 --- a/Histacom2/OS/Win95/Win95.cs +++ b/Histacom2/OS/Win95/Win95.cs @@ -312,6 +312,10 @@ namespace Histacom2.OS.Win95 { //wm.StartInfobox95("Win32 Application", "That is not a valid Win32 Application.", Properties.Resources.Win95Error); } + else if (objListViewItem.Text == "Online Services") + { + wm.StartInfobox95("Caught it!", "If you were to run this, the game would crash!\nLuckily, it won't crash this time!", InfoboxType.Error, InfoboxButtons.OK); + } else { // It is an actual file on the disk -- cgit v1.2.3