Merge branch 'master' of https://github.com/UniverseDevGroup/Project-Ports

6 files changed, 105 insertions, 28 deletions

diff --git a/Project Ports/App.config b/Project Ports/App.config
index 731f6de..401db40 100644
--- a/Project Ports/App.config
+++ b/Project Ports/App.config
@@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
+    <configSections>
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+            <section name="Project_Ports.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+        </sectionGroup>
+    </configSections>
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
     </startup>
+    <userSettings>
+        <Project_Ports.Properties.Settings>
+            <setting name="hijacked" 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 c39b2a1..bb89848 100644
--- a/Project Ports/Desktop.Designer.cs
+++ b/Project Ports/Desktop.Designer.cs
@@ -41,7 +41,12 @@
             this.ltime = new System.Windows.Forms.Label();
             this.dclock = new System.Windows.Forms.Timer(this.components);
             this.quantumNetBrowserToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.hijackScreen = new System.Windows.Forms.Panel();
+            this.hijackLabel = new System.Windows.Forms.Label();
+            this.hijackStoryline = new System.Windows.Forms.Label();
+            this.textgen = new System.Windows.Forms.Timer(this.components);
             this.appMenu.SuspendLayout();
+            this.hijackScreen.SuspendLayout();
             this.SuspendLayout();
             // 
             // appMenu
@@ -76,20 +81,20 @@
             this.chatterToolStripMenuItem,
             this.quantumNetBrowserToolStripMenuItem});
             this.programsToolStripMenuItem.Name = "programsToolStripMenuItem";
-            this.programsToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.programsToolStripMenuItem.Size = new System.Drawing.Size(131, 22);
             this.programsToolStripMenuItem.Text = "Programs";
             // 
             // terminalToolStripMenuItem
             // 
             this.terminalToolStripMenuItem.Name = "terminalToolStripMenuItem";
-            this.terminalToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.terminalToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
             this.terminalToolStripMenuItem.Text = "Terminal";
             this.terminalToolStripMenuItem.Click += new System.EventHandler(this.terminalToolStripMenuItem_Click);
             // 
             // testWindowToolStripMenuItem
             // 
             this.testWindowToolStripMenuItem.Name = "testWindowToolStripMenuItem";
-            this.testWindowToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.testWindowToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
             this.testWindowToolStripMenuItem.Text = "TestWindow";
             this.testWindowToolStripMenuItem.Click += new System.EventHandler(this.testWindowToolStripMenuItem_Click);
             // 
@@ -97,25 +102,26 @@
             // 
             this.chatterToolStripMenuItem.Name = "chatterToolStripMenuItem";
             this.chatterToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.chatterToolStripMenuItem.Size = new System.Drawing.Size(143, 22);
             this.chatterToolStripMenuItem.Text = "Chatter";
             this.chatterToolStripMenuItem.Click += new System.EventHandler(this.chatterToolStripMenuItem_Click);
             // 
             // settingsToolStripMenuItem
             // 
             this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
-            this.settingsToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.settingsToolStripMenuItem.Size = new System.Drawing.Size(131, 22);
             this.settingsToolStripMenuItem.Text = "Settings";
             this.settingsToolStripMenuItem.Click += new System.EventHandler(this.settingsToolStripMenuItem_Click);
             // 
             // toolStripSeparator1
             // 
             this.toolStripSeparator1.Name = "toolStripSeparator1";
-            this.toolStripSeparator1.Size = new System.Drawing.Size(177, 6);
+            this.toolStripSeparator1.Size = new System.Drawing.Size(128, 6);
             // 
             // shutdownToolStripMenuItem
             // 
             this.shutdownToolStripMenuItem.Name = "shutdownToolStripMenuItem";
-            this.shutdownToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.shutdownToolStripMenuItem.Size = new System.Drawing.Size(131, 22);
             this.shutdownToolStripMenuItem.Text = "Shutdown";
             this.shutdownToolStripMenuItem.Click += new System.EventHandler(this.shutdownToolStripMenuItem_Click);
             // 
@@ -142,6 +148,38 @@
             this.quantumNetBrowserToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
             this.quantumNetBrowserToolStripMenuItem.Text = "QuantumNet Browser";
             this.quantumNetBrowserToolStripMenuItem.Click += new System.EventHandler(this.quantumNetBrowserToolStripMenuItem_Click);
+            // hijackScreen
+            // 
+            this.hijackScreen.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.hijackScreen.BackColor = System.Drawing.Color.Black;
+            this.hijackScreen.Controls.Add(this.hijackStoryline);
+            this.hijackScreen.Controls.Add(this.hijackLabel);
+            this.hijackScreen.Location = new System.Drawing.Point(0, 0);
+            this.hijackScreen.Name = "hijackScreen";
+            this.hijackScreen.Size = new System.Drawing.Size(800, 449);
+            this.hijackScreen.TabIndex = 2;
+            // 
+            // hijackLabel
+            // 
+            this.hijackLabel.AutoSize = true;
+            this.hijackLabel.Font = new System.Drawing.Font("Consolas", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.hijackLabel.ForeColor = System.Drawing.Color.Red;
+            this.hijackLabel.Location = new System.Drawing.Point(12, 11);
+            this.hijackLabel.Name = "hijackLabel";
+            this.hijackLabel.Size = new System.Drawing.Size(259, 15);
+            this.hijackLabel.TabIndex = 0;
+            this.hijackLabel.Text = "SYSTEM ERROR 3923882: BEING HIJACKED";
+            // 
+            // hijackStoryline
+            // 
+            this.hijackStoryline.AutoSize = true;
+            this.hijackStoryline.Location = new System.Drawing.Point(12, 40);
+            this.hijackStoryline.Name = "hijackStoryline";
+            this.hijackStoryline.Size = new System.Drawing.Size(75, 13);
+            this.hijackStoryline.TabIndex = 1;
+            this.hijackStoryline.Text = "hijackStoryline";
             // 
             // Desktop
             // 
@@ -149,6 +187,7 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.WindowFrame;
             this.ClientSize = new System.Drawing.Size(800, 450);
+            this.Controls.Add(this.hijackScreen);
             this.Controls.Add(this.ltime);
             this.Controls.Add(this.appMenu);
             this.ForeColor = System.Drawing.Color.White;
@@ -160,6 +199,8 @@
             this.Load += new System.EventHandler(this.Desktop_Load);
             this.appMenu.ResumeLayout(false);
             this.appMenu.PerformLayout();
+            this.hijackScreen.ResumeLayout(false);
+            this.hijackScreen.PerformLayout();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -179,5 +220,9 @@
         private System.Windows.Forms.ToolStripMenuItem testWindowToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem chatterToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem quantumNetBrowserToolStripMenuItem;
+        private System.Windows.Forms.Panel hijackScreen;
+        private System.Windows.Forms.Label hijackLabel;
+        private System.Windows.Forms.Label hijackStoryline;
+        private System.Windows.Forms.Timer textgen;
     }
 }
\ No newline at end of file
diff --git a/Project Ports/Desktop.cs b/Project Ports/Desktop.cs
index 26b9e93..506c9d9 100644
--- a/Project Ports/Desktop.cs
+++ b/Project Ports/Desktop.cs
@@ -49,9 +49,16 @@ namespace Project_Ports
 
         private void Desktop_Load(object sender, EventArgs e)
         {
-            #if DEBUG
-            MessageBox.Show("Welcome to the Project Ports Desktop!");
-            #endif
+            hijackLabel.Hide();
+            hijackStoryline.Hide();
+            hijackScreen.Hide();
+            if(Properties.Settings.Default.hijacked == true)
+            {
+                hijackLabel.Show();
+                hijackStoryline.Show();
+                hijackScreen.Show();
+
+            }
             dclock.Start();
         }
         
diff --git a/Project Ports/Desktop.resx b/Project Ports/Desktop.resx
index 9bf389e..86bf0fc 100644
--- a/Project Ports/Desktop.resx
+++ b/Project Ports/Desktop.resx
@@ -123,4 +123,7 @@
   <metadata name="dclock.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>121, 17</value>
   </metadata>
+  <metadata name="textgen.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>208, 17</value>
+  </metadata>
 </root>
\ No newline at end of file
diff --git a/Project Ports/Properties/Settings.Designer.cs b/Project Ports/Properties/Settings.Designer.cs
index 5d13839..8a6e7d7 100644
--- a/Project Ports/Properties/Settings.Designer.cs
+++ b/Project Ports/Properties/Settings.Designer.cs
@@ -8,23 +8,31 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Project_Ports.Properties
-{
-
-
+namespace Project_Ports.Properties {
+    
+    
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
-    {
-
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.6.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
-        public static Settings Default
-        {
-            get
-            {
+        
+        public static Settings Default {
+            get {
                 return defaultInstance;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("True")]
+        public bool hijacked {
+            get {
+                return ((bool)(this["hijacked"]));
+            }
+            set {
+                this["hijacked"] = value;
+            }
+        }
     }
 }
diff --git a/Project Ports/Properties/Settings.settings b/Project Ports/Properties/Settings.settings
index 3964565..eb1c916 100644
--- a/Project Ports/Properties/Settings.settings
+++ b/Project Ports/Properties/Settings.settings
@@ -1,7 +1,9 @@
 <?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
-</SettingsFile>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="Project_Ports.Properties" GeneratedClassName="Settings">
+  <Profiles />
+  <Settings>
+    <Setting Name="hijacked" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
+  </Settings>
+</SettingsFile>
\ No newline at end of file