diff --git a/Advanced Software Engineering/Advanced Software Engineering/ErrorWindow.Designer.cs b/Advanced Software Engineering/Advanced Software Engineering/ErrorWindow.Designer.cs
index afd1cea..0bd78f3 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/ErrorWindow.Designer.cs
+++ b/Advanced Software Engineering/Advanced Software Engineering/ErrorWindow.Designer.cs
@@ -23,13 +23,14 @@
/// the contents of this method with the code editor.
///
private void InitializeComponent() {
+ System.Windows.Forms.GroupBox groupBox1;
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.button1 = new System.Windows.Forms.Button();
this.label1 = new System.Windows.Forms.Label();
- this.textBox1 = new System.Windows.Forms.TextBox();
- this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.button2 = new System.Windows.Forms.Button();
+ groupBox1 = new System.Windows.Forms.GroupBox();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
- this.groupBox1.SuspendLayout();
+ groupBox1.SuspendLayout();
this.SuspendLayout();
//
// pictureBox1
@@ -43,57 +44,63 @@
// button1
//
this.button1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.button1.Location = new System.Drawing.Point(0, 430);
+ this.button1.Location = new System.Drawing.Point(0, 127);
this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(330, 23);
+ this.button1.Size = new System.Drawing.Size(336, 23);
this.button1.TabIndex = 1;
- this.button1.Text = "button1";
+ this.button1.Text = "Exit";
this.button1.UseVisualStyleBackColor = true;
+ this.button1.Click += new System.EventHandler(this.button1_Click);
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(68, 19);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(35, 13);
+ this.label1.Size = new System.Drawing.Size(60, 13);
this.label1.TabIndex = 2;
- this.label1.Text = "label1";
- //
- // textBox1
- //
- this.textBox1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.textBox1.Enabled = false;
- this.textBox1.Location = new System.Drawing.Point(0, 106);
- this.textBox1.Multiline = true;
- this.textBox1.Name = "textBox1";
- this.textBox1.Size = new System.Drawing.Size(330, 324);
- this.textBox1.TabIndex = 3;
+ this.label1.Text = "Error Name";
//
// groupBox1
//
- this.groupBox1.Controls.Add(this.pictureBox1);
- this.groupBox1.Controls.Add(this.label1);
- this.groupBox1.Dock = System.Windows.Forms.DockStyle.Top;
- this.groupBox1.Location = new System.Drawing.Point(0, 0);
- this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(330, 100);
- this.groupBox1.TabIndex = 4;
- this.groupBox1.TabStop = false;
- this.groupBox1.Text = "groupBox1";
+ groupBox1.AutoSize = true;
+ groupBox1.Controls.Add(this.pictureBox1);
+ groupBox1.Controls.Add(this.label1);
+ groupBox1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ groupBox1.Location = new System.Drawing.Point(0, 6);
+ groupBox1.Name = "groupBox1";
+ groupBox1.Size = new System.Drawing.Size(336, 98);
+ groupBox1.TabIndex = 4;
+ groupBox1.TabStop = false;
+ groupBox1.Text = "Error";
+ //
+ // button2
+ //
+ this.button2.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.button2.Location = new System.Drawing.Point(0, 104);
+ this.button2.Name = "button2";
+ this.button2.Size = new System.Drawing.Size(336, 23);
+ this.button2.TabIndex = 5;
+ this.button2.Text = "Show Details";
+ this.button2.UseVisualStyleBackColor = true;
//
// ErrorWindow
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(330, 453);
- this.Controls.Add(this.groupBox1);
- this.Controls.Add(this.textBox1);
+ this.ClientSize = new System.Drawing.Size(336, 150);
+ this.Controls.Add(groupBox1);
+ this.Controls.Add(this.button2);
this.Controls.Add(this.button1);
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
this.Name = "ErrorWindow";
- this.Text = "ErrorWindow";
+ this.Text = "Error";
+ this.TopMost = true;
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
- this.groupBox1.ResumeLayout(false);
- this.groupBox1.PerformLayout();
+ groupBox1.ResumeLayout(false);
+ groupBox1.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@@ -104,7 +111,6 @@
private System.Windows.Forms.PictureBox pictureBox1;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.Label label1;
- private System.Windows.Forms.TextBox textBox1;
- private System.Windows.Forms.GroupBox groupBox1;
+ private System.Windows.Forms.Button button2;
}
}
\ No newline at end of file
diff --git a/Advanced Software Engineering/Advanced Software Engineering/ErrorWindow.cs b/Advanced Software Engineering/Advanced Software Engineering/ErrorWindow.cs
index bd66798..8de704d 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/ErrorWindow.cs
+++ b/Advanced Software Engineering/Advanced Software Engineering/ErrorWindow.cs
@@ -13,5 +13,9 @@ namespace Advanced_Software_Engineering {
public ErrorWindow() {
InitializeComponent();
}
+
+ private void button1_Click(object sender, EventArgs e) {
+ Close();
+ }
}
}
diff --git a/Advanced Software Engineering/Advanced Software Engineering/ErrorWindow.resx b/Advanced Software Engineering/Advanced Software Engineering/ErrorWindow.resx
index 1af7de1..056d783 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/ErrorWindow.resx
+++ b/Advanced Software Engineering/Advanced Software Engineering/ErrorWindow.resx
@@ -117,4 +117,7 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ False
+
\ No newline at end of file
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Menu.Designer.cs b/Advanced Software Engineering/Advanced Software Engineering/Menu.Designer.cs
index 482909f..80077f3 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/Menu.Designer.cs
+++ b/Advanced Software Engineering/Advanced Software Engineering/Menu.Designer.cs
@@ -113,6 +113,7 @@
this.button5.TabIndex = 3;
this.button5.Text = "Simple Error Box Test";
this.button5.UseVisualStyleBackColor = true;
+ this.button5.Click += new System.EventHandler(this.button5_Click);
//
// Menu
//
diff --git a/Advanced Software Engineering/Advanced Software Engineering/Menu.cs b/Advanced Software Engineering/Advanced Software Engineering/Menu.cs
index 05a04da..3ccc399 100644
--- a/Advanced Software Engineering/Advanced Software Engineering/Menu.cs
+++ b/Advanced Software Engineering/Advanced Software Engineering/Menu.cs
@@ -50,5 +50,9 @@ namespace Advanced_Software_Engineering
{
//Do things on load
}
+
+ private void button5_Click(object sender, EventArgs e) {
+ new ErrorWindow().Show();
+ }
}
}