diff options
Diffstat (limited to 'Project Ports')
| -rw-r--r-- | Project Ports/Boot.Designer.cs | 26 | ||||
| -rw-r--r-- | Project Ports/Boot.cs | 12 | ||||
| -rw-r--r-- | Project Ports/Crash.Designer.cs | 2 | ||||
| -rw-r--r-- | Project Ports/Crash.cs | 4 | ||||
| -rw-r--r-- | Project Ports/MainMenu.cs | 6 | ||||
| -rw-r--r-- | Project Ports/Programs/ChatApp.cs | 2 | ||||
| -rw-r--r-- | Project Ports/hijackScreen.Designer.cs | 24 | ||||
| -rw-r--r-- | Project Ports/hijackScreen.cs | 3 |
8 files changed, 32 insertions, 47 deletions
diff --git a/Project Ports/Boot.Designer.cs b/Project Ports/Boot.Designer.cs index fdf84db..2add7a1 100644 --- a/Project Ports/Boot.Designer.cs +++ b/Project Ports/Boot.Designer.cs @@ -29,8 +29,6 @@ private void InitializeComponent() { this.txtBoot = new System.Windows.Forms.RichTextBox(); - this.panel1 = new System.Windows.Forms.Panel(); - this.panel1.SuspendLayout(); this.SuspendLayout(); // // txtBoot @@ -41,8 +39,9 @@ this.txtBoot.BackColor = System.Drawing.Color.Black; this.txtBoot.BorderStyle = System.Windows.Forms.BorderStyle.None; this.txtBoot.Cursor = System.Windows.Forms.Cursors.IBeam; + this.txtBoot.Font = new System.Drawing.Font("Consolas", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txtBoot.ForeColor = System.Drawing.Color.White; - this.txtBoot.Location = new System.Drawing.Point(11, 12); + 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; @@ -50,33 +49,21 @@ this.txtBoot.TabIndex = 0; this.txtBoot.Text = ""; // - // panel1 - // - this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.panel1.BackColor = System.Drawing.Color.Black; - this.panel1.Controls.Add(this.txtBoot); - this.panel1.Location = new System.Drawing.Point(-1, 0); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(590, 460); - this.panel1.TabIndex = 1; - // // Boot // this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.Color.White; + this.BackColor = System.Drawing.Color.Black; this.ClientSize = new System.Drawing.Size(589, 453); - this.Controls.Add(this.panel1); + this.Controls.Add(this.txtBoot); this.Font = new System.Drawing.Font("Consolas", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.ForeColor = System.Drawing.Color.White; + this.ForeColor = System.Drawing.Color.Black; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.Margin = new System.Windows.Forms.Padding(5); this.Name = "Boot"; this.Text = "Boot"; + this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.Load += new System.EventHandler(this.Boot_Load); - this.panel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -84,6 +71,5 @@ #endregion private System.Windows.Forms.RichTextBox txtBoot; - private System.Windows.Forms.Panel panel1; } }
\ No newline at end of file diff --git a/Project Ports/Boot.cs b/Project Ports/Boot.cs index bafd026..1f4a628 100644 --- a/Project Ports/Boot.cs +++ b/Project Ports/Boot.cs @@ -37,17 +37,15 @@ namespace Project_Ports InitializeComponent(); } - private void Boot_Load(object sender, EventArgs e) + private async void Boot_Load(object sender, EventArgs e) { - Thread.Sleep(2000); - txtBoot.AppendText("PortOS is now booting..."); - Thread.Sleep(2000); + await Task.Delay(2000); txtBoot.AppendText("PortOS is now booting..." + Environment.NewLine); - Thread.Sleep(2000); + await Task.Delay(2000); txtBoot.AppendText("GUI Driver has been found!" + Environment.NewLine); - Thread.Sleep(2000); + await Task.Delay(2000); txtBoot.AppendText("Starting Desktop..." + Environment.NewLine); - Thread.Sleep(3000); + await Task.Delay(2000); Desktop desktop = new Desktop(); desktop.Show(); diff --git a/Project Ports/Crash.Designer.cs b/Project Ports/Crash.Designer.cs index 8c9d8d7..28ad72a 100644 --- a/Project Ports/Crash.Designer.cs +++ b/Project Ports/Crash.Designer.cs @@ -42,7 +42,7 @@ this.txtCrash.BackColor = System.Drawing.Color.Black; this.txtCrash.BorderStyle = System.Windows.Forms.BorderStyle.None; this.txtCrash.Cursor = System.Windows.Forms.Cursors.IBeam; - this.txtCrash.Font = new System.Drawing.Font("Consolas", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txtCrash.Font = new System.Drawing.Font("Consolas", 11.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(21, 15); this.txtCrash.MaxLength = 32767; diff --git a/Project Ports/Crash.cs b/Project Ports/Crash.cs index 25eec91..daaaae9 100644 --- a/Project Ports/Crash.cs +++ b/Project Ports/Crash.cs @@ -38,9 +38,9 @@ namespace Project_Ports InitializeComponent(); } - private void Crash_Load(object sender, EventArgs e) + private async void Crash_Load(object sender, EventArgs e) { - Thread.Sleep(2000); + await Task.Delay(2000); if (Properties.Settings.Default.hijacked2 == true) { MessageBox.Show("Coming soon!"); diff --git a/Project Ports/MainMenu.cs b/Project Ports/MainMenu.cs index 180b95b..357586a 100644 --- a/Project Ports/MainMenu.cs +++ b/Project Ports/MainMenu.cs @@ -43,10 +43,10 @@ namespace Project_Ports private void btnPlay_Click(object sender, EventArgs e) { - Desktop desktop = new Desktop(); + Desktop desktop = new Desktop(); + Boot boot = new Boot(); #if DEBUG Properties.Settings.Default.hijacked = false; - desktop.Show(); #endif if (Properties.Settings.Default.hijacked == true) { @@ -55,7 +55,7 @@ namespace Project_Ports } else { - desktop.Show(); + boot.Show(); } } diff --git a/Project Ports/Programs/ChatApp.cs b/Project Ports/Programs/ChatApp.cs index 2fd2070..be46345 100644 --- a/Project Ports/Programs/ChatApp.cs +++ b/Project Ports/Programs/ChatApp.cs @@ -55,7 +55,7 @@ namespace Project_Ports private void ChatApp_Load(object sender, EventArgs e) { - txtSentMessages.AppendText(GeneralAPI.PlayerName + " has entered the channel!"); + txtSentMessages.AppendText(GeneralAPI.PlayerName + " has entered the channel!" + Environment.NewLine); } diff --git a/Project Ports/hijackScreen.Designer.cs b/Project Ports/hijackScreen.Designer.cs index c251ca7..846b02f 100644 --- a/Project Ports/hijackScreen.Designer.cs +++ b/Project Ports/hijackScreen.Designer.cs @@ -29,8 +29,8 @@ private void InitializeComponent() { this.hijackPanel = new System.Windows.Forms.Panel(); - this.txtHijack = new System.Windows.Forms.TextBox(); this.btnSkipHijack = new System.Windows.Forms.Button(); + this.txtHijack = new System.Windows.Forms.TextBox(); this.hijackPanel.SuspendLayout(); this.SuspendLayout(); // @@ -47,6 +47,17 @@ this.hijackPanel.Size = new System.Drawing.Size(986, 571); this.hijackPanel.TabIndex = 3; // + // btnSkipHijack + // + this.btnSkipHijack.Font = new System.Drawing.Font("Consolas", 10F); + this.btnSkipHijack.Location = new System.Drawing.Point(880, 531); + this.btnSkipHijack.Name = "btnSkipHijack"; + this.btnSkipHijack.Size = new System.Drawing.Size(103, 37); + this.btnSkipHijack.TabIndex = 4; + this.btnSkipHijack.Text = "Skip"; + this.btnSkipHijack.UseVisualStyleBackColor = true; + this.btnSkipHijack.Click += new System.EventHandler(this.btnSkipHijack_Click); + // // txtHijack // this.txtHijack.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -64,17 +75,6 @@ this.txtHijack.Size = new System.Drawing.Size(957, 547); this.txtHijack.TabIndex = 3; // - // btnSkipHijack - // - this.btnSkipHijack.Font = new System.Drawing.Font("Consolas", 10F); - this.btnSkipHijack.Location = new System.Drawing.Point(880, 531); - this.btnSkipHijack.Name = "btnSkipHijack"; - this.btnSkipHijack.Size = new System.Drawing.Size(103, 37); - this.btnSkipHijack.TabIndex = 4; - this.btnSkipHijack.Text = "Skip"; - this.btnSkipHijack.UseVisualStyleBackColor = true; - this.btnSkipHijack.Click += new System.EventHandler(this.btnSkipHijack_Click); - // // hijackScreen // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/Project Ports/hijackScreen.cs b/Project Ports/hijackScreen.cs index fca9070..40e8fa7 100644 --- a/Project Ports/hijackScreen.cs +++ b/Project Ports/hijackScreen.cs @@ -40,13 +40,14 @@ namespace Project_Ports private void hijackScreen_Load(object sender, EventArgs e) { - StorylineAPI.StartHijackEvent1(txtHijack); + StorylineAPI.StartHijackEvent1(txtHijack); } private void btnSkipHijack_Click(object sender, EventArgs e) { Desktop desktop = new Desktop(); desktop.Show(); + this.Close(); } } } |
