diff options
| -rw-r--r-- | Project Ports/App.config | 3 | ||||
| -rw-r--r-- | Project Ports/Desktop.Designer.cs | 28 | ||||
| -rw-r--r-- | Project Ports/Desktop.resx | 3 | ||||
| -rw-r--r-- | Project Ports/MainMenu.cs | 2 | ||||
| -rw-r--r-- | Project Ports/Programs/ChatApp.Designer.cs | 1 | ||||
| -rw-r--r-- | Project Ports/Programs/ChatApp.cs | 26 | ||||
| -rw-r--r-- | Project Ports/Properties/Settings.Designer.cs | 12 | ||||
| -rw-r--r-- | Project Ports/Properties/Settings.settings | 3 |
8 files changed, 59 insertions, 19 deletions
diff --git a/Project Ports/App.config b/Project Ports/App.config index 401db40..34061dd 100644 --- a/Project Ports/App.config +++ b/Project Ports/App.config @@ -13,6 +13,9 @@ <setting name="hijacked" serializeAs="String"> <value>True</value> </setting> + <setting name="chatterStoryline" serializeAs="String"> + <value>True</value> + </setting> </Project_Ports.Properties.Settings> </userSettings> </configuration>
\ No newline at end of file diff --git a/Project Ports/Desktop.Designer.cs b/Project Ports/Desktop.Designer.cs index c7ce437..a3c538d 100644 --- a/Project Ports/Desktop.Designer.cs +++ b/Project Ports/Desktop.Designer.cs @@ -31,7 +31,6 @@ this.components = new System.ComponentModel.Container(); this.ltime = new System.Windows.Forms.Label(); this.dclock = new System.Windows.Forms.Timer(this.components); - this.textgen = new System.Windows.Forms.Timer(this.components); this.appMenu = new System.Windows.Forms.Panel(); this.programStrip = new System.Windows.Forms.ToolStrip(); this.programButton = new System.Windows.Forms.ToolStripDropDownButton(); @@ -41,8 +40,8 @@ this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.quantumNetBrowserToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.panel2 = new System.Windows.Forms.Panel(); - this.shutdownButton = new System.Windows.Forms.Button(); this.panel1 = new System.Windows.Forms.Panel(); + this.shutdownButton = new System.Windows.Forms.Button(); this.playerName = new System.Windows.Forms.Label(); this.taskBar = new System.Windows.Forms.Panel(); this.appButton = new System.Windows.Forms.Button(); @@ -89,7 +88,7 @@ this.programStrip.Location = new System.Drawing.Point(9, 349); this.programStrip.Name = "programStrip"; this.programStrip.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional; - this.programStrip.Size = new System.Drawing.Size(110, 25); + this.programStrip.Size = new System.Drawing.Size(79, 25); this.programStrip.TabIndex = 2; this.programStrip.Text = "toolStrip1"; // @@ -154,6 +153,17 @@ this.panel2.Size = new System.Drawing.Size(376, 52); this.panel2.TabIndex = 1; // + // panel1 + // + this.panel1.BackColor = System.Drawing.Color.Gray; + this.panel1.Controls.Add(this.shutdownButton); + this.panel1.Controls.Add(this.playerName); + this.panel1.ForeColor = System.Drawing.Color.Gray; + this.panel1.Location = new System.Drawing.Point(0, 1); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(376, 51); + this.panel1.TabIndex = 0; + // // shutdownButton // this.shutdownButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; @@ -167,17 +177,6 @@ this.shutdownButton.UseVisualStyleBackColor = true; this.shutdownButton.Click += new System.EventHandler(this.shutdownButton_Click); // - // panel1 - // - this.panel1.BackColor = System.Drawing.Color.Gray; - this.panel1.Controls.Add(this.shutdownButton); - this.panel1.Controls.Add(this.playerName); - this.panel1.ForeColor = System.Drawing.Color.Gray; - this.panel1.Location = new System.Drawing.Point(0, 1); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(376, 51); - this.panel1.TabIndex = 0; - // // playerName // this.playerName.AutoSize = true; @@ -244,7 +243,6 @@ #endregion private System.Windows.Forms.Label ltime; private System.Windows.Forms.Timer dclock; - private System.Windows.Forms.Timer textgen; private System.Windows.Forms.Panel appMenu; private System.Windows.Forms.Panel taskBar; private System.Windows.Forms.Button appButton; diff --git a/Project Ports/Desktop.resx b/Project Ports/Desktop.resx index 6dedbbe..c218578 100644 --- a/Project Ports/Desktop.resx +++ b/Project Ports/Desktop.resx @@ -120,9 +120,6 @@ <metadata name="dclock.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>214, 17</value> </metadata> - <metadata name="textgen.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <value>121, 17</value> - </metadata> <metadata name="programStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>21, 15</value> </metadata> diff --git a/Project Ports/MainMenu.cs b/Project Ports/MainMenu.cs index b9e5ca9..225e2cf 100644 --- a/Project Ports/MainMenu.cs +++ b/Project Ports/MainMenu.cs @@ -44,8 +44,8 @@ namespace Project_Ports { Desktop desktop = new Desktop(); #if DEBUG + Properties.Settings.Default.hijacked = false; desktop.Show(); - return; #endif if (Properties.Settings.Default.hijacked == true) { diff --git a/Project Ports/Programs/ChatApp.Designer.cs b/Project Ports/Programs/ChatApp.Designer.cs index f6a3dbd..4084dfd 100644 --- a/Project Ports/Programs/ChatApp.Designer.cs +++ b/Project Ports/Programs/ChatApp.Designer.cs @@ -97,6 +97,7 @@ this.Controls.Add(this.txtSentMessages); this.Name = "ChatApp"; this.Size = new System.Drawing.Size(578, 219); + this.Load += new System.EventHandler(this.ChatApp_Load); this.ResumeLayout(false); this.PerformLayout(); diff --git a/Project Ports/Programs/ChatApp.cs b/Project Ports/Programs/ChatApp.cs index 0e89077..86819e9 100644 --- a/Project Ports/Programs/ChatApp.cs +++ b/Project Ports/Programs/ChatApp.cs @@ -5,6 +5,7 @@ using System.Drawing; using System.Data; using System.Linq; using System.Text; +using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; using PortEngine; @@ -32,5 +33,30 @@ namespace Project_Ports e.SuppressKeyPress = true; } } + + private void ChatApp_Load(object sender, EventArgs e) + { + /* + #if DEBUG + Properties.Settings.Default.chatterStoryline = false; + #endif + */ + + if (Properties.Settings.Default.chatterStoryline == true) + { + Thread.Sleep(2000); + txtSentMessages.AppendText("Adam has entered the channel..." + Environment.NewLine); + Thread.Sleep(2000); + txtSentMessages.AppendText("<Adam> Hey there user!" + Environment.NewLine); + Thread.Sleep(2000); + txtSentMessages.AppendText("<Adam> You need to set a name so I know who you are." + Environment.NewLine); + Thread.Sleep(2000); + txtSentMessages.AppendText("<Adam> Open a terminal and input do the following: \"changeusername --YourUsernameHere\"." + Environment.NewLine); + Thread.Sleep(10000); + txtSentMessages.AppendText("<Adam> Great!" + Environment.NewLine); + Thread.Sleep(2000); + txtSentMessages.AppendText("<Adam> Hello username" + Environment.NewLine); //TODO + } + } } } diff --git a/Project Ports/Properties/Settings.Designer.cs b/Project Ports/Properties/Settings.Designer.cs index 8a6e7d7..b141875 100644 --- a/Project Ports/Properties/Settings.Designer.cs +++ b/Project Ports/Properties/Settings.Designer.cs @@ -34,5 +34,17 @@ namespace Project_Ports.Properties { this["hijacked"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool chatterStoryline { + get { + return ((bool)(this["chatterStoryline"])); + } + set { + this["chatterStoryline"] = value; + } + } } } diff --git a/Project Ports/Properties/Settings.settings b/Project Ports/Properties/Settings.settings index eb1c916..9ed20d1 100644 --- a/Project Ports/Properties/Settings.settings +++ b/Project Ports/Properties/Settings.settings @@ -5,5 +5,8 @@ <Setting Name="hijacked" Type="System.Boolean" Scope="User"> <Value Profile="(Default)">True</Value> </Setting> + <Setting Name="chatterStoryline" Type="System.Boolean" Scope="User"> + <Value Profile="(Default)">True</Value> + </Setting> </Settings> </SettingsFile>
\ No newline at end of file |
