aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew <alee14498@gmail.com>2018-08-28 18:41:25 -0400
committerAndrew <alee14498@gmail.com>2018-08-28 18:41:25 -0400
commitc4202ae2daf74e47c1327ccbf0113cc3a7512c7a (patch)
treec1e0ee04b34d68064bc1d9d48f07fc652e88314f
parent0be5946ce559ea76df7301bcbea87f17f6487652 (diff)
downloadProject-Silicon-c4202ae2daf74e47c1327ccbf0113cc3a7512c7a.tar.gz
Project-Silicon-c4202ae2daf74e47c1327ccbf0113cc3a7512c7a.tar.bz2
Project-Silicon-c4202ae2daf74e47c1327ccbf0113cc3a7512c7a.zip
Changed the crashing
-rw-r--r--Project Ports/Boot.Designer.cs1
-rw-r--r--Project Ports/Crash.Designer.cs19
-rw-r--r--Project Ports/Crash.cs14
3 files changed, 26 insertions, 8 deletions
diff --git a/Project Ports/Boot.Designer.cs b/Project Ports/Boot.Designer.cs
index 91927d7..e07b929 100644
--- a/Project Ports/Boot.Designer.cs
+++ b/Project Ports/Boot.Designer.cs
@@ -43,6 +43,7 @@
this.txtBoot.Location = new System.Drawing.Point(12, 12);
this.txtBoot.Name = "txtBoot";
this.txtBoot.ReadOnly = true;
+ this.txtBoot.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.None;
this.txtBoot.Size = new System.Drawing.Size(565, 429);
this.txtBoot.TabIndex = 0;
this.txtBoot.Text = "";
diff --git a/Project Ports/Crash.Designer.cs b/Project Ports/Crash.Designer.cs
index 3a81699..5f3906a 100644
--- a/Project Ports/Crash.Designer.cs
+++ b/Project Ports/Crash.Designer.cs
@@ -29,6 +29,7 @@
private void InitializeComponent()
{
this.txtCrash = new System.Windows.Forms.RichTextBox();
+ this.button1 = new System.Windows.Forms.Button();
this.SuspendLayout();
//
// txtCrash
@@ -42,11 +43,25 @@
this.txtCrash.Font = new System.Drawing.Font("Consolas", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.txtCrash.ForeColor = System.Drawing.Color.Red;
this.txtCrash.Location = new System.Drawing.Point(12, 12);
+ this.txtCrash.MaxLength = 32767;
this.txtCrash.Name = "txtCrash";
this.txtCrash.ReadOnly = true;
+ this.txtCrash.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.None;
this.txtCrash.Size = new System.Drawing.Size(693, 441);
this.txtCrash.TabIndex = 0;
- this.txtCrash.Text = "";
+ this.txtCrash.Text = "PortOS.GUI has crashed...\nSYSTEM ERROR: CRASHED\nRebooting PortOS....";
+ //
+ // button1
+ //
+ this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.button1.ForeColor = System.Drawing.Color.White;
+ this.button1.Location = new System.Drawing.Point(553, 430);
+ this.button1.Name = "button1";
+ this.button1.Size = new System.Drawing.Size(152, 23);
+ this.button1.TabIndex = 1;
+ this.button1.Text = "Close (This will be removed)";
+ this.button1.UseVisualStyleBackColor = true;
+ this.button1.Click += new System.EventHandler(this.button1_Click);
//
// Crash
//
@@ -54,6 +69,7 @@
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.Black;
this.ClientSize = new System.Drawing.Size(717, 465);
+ this.Controls.Add(this.button1);
this.Controls.Add(this.txtCrash);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Name = "Crash";
@@ -67,5 +83,6 @@
#endregion
private System.Windows.Forms.RichTextBox txtCrash;
+ private System.Windows.Forms.Button button1;
}
} \ No newline at end of file
diff --git a/Project Ports/Crash.cs b/Project Ports/Crash.cs
index 0bfb955..346aa40 100644
--- a/Project Ports/Crash.cs
+++ b/Project Ports/Crash.cs
@@ -22,12 +22,7 @@ namespace Project_Ports
private void Crash_Load(object sender, EventArgs e)
{
this.BringToFront();
- Thread.Sleep(2000);
- txtCrash.AppendText("PortOS.GUI has crashed..." + Environment.NewLine);
- Thread.Sleep(2000);
- txtCrash.AppendText("SYSTEM ERROR: Crashed" + Environment.NewLine);
- Thread.Sleep(2000);
- txtCrash.AppendText("Rebooting PortOS..." + Environment.NewLine);
+ /*
if (Properties.Settings.Default.hijacked2 == true)
{
MessageBox.Show("Coming soon!");
@@ -37,7 +32,12 @@ namespace Project_Ports
Boot boot = new Boot();
boot.Show();
this.Close();
- }
+ }*/
+ }
+
+ private void button1_Click(object sender, EventArgs e)
+ {
+ this.Close();
}
}
}