aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFloppyDiskDrive <[email protected]>2017-09-12 20:05:57 -0500
committerFloppyDiskDrive <[email protected]>2017-09-12 20:05:57 -0500
commit64d08f8ee9497ae0ef06ad8094080a8897d224a9 (patch)
tree7cd5b04d0724831935def9199b3152b8eca6dc66
parent6d26e57fd4519cea330f51e491bfe54cc347719a (diff)
downloadhistacom2-64d08f8ee9497ae0ef06ad8094080a8897d224a9.tar.gz
histacom2-64d08f8ee9497ae0ef06ad8094080a8897d224a9.tar.bz2
histacom2-64d08f8ee9497ae0ef06ad8094080a8897d224a9.zip
Revert "Various fixes (Bug fix/UI Cleanup #3)"
This reverts commit 6d26e57fd4519cea330f51e491bfe54cc347719a.
-rw-r--r--Histacom2.Engine/Template/AboutBox95.Designer.cs28
-rw-r--r--Histacom2.Engine/Template/AboutBox95.cs5
-rw-r--r--Histacom2/OS/Win95/Win95.cs4
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