SidePanel system, system status, crapton of other neat things

4 files changed, 93 insertions, 11 deletions

diff --git a/ShiftOS.Frontend/Apps/CodeShop.cs b/ShiftOS.Frontend/Apps/CodeShop.cs
index ad44fda..ff39d6e 100644
--- a/ShiftOS.Frontend/Apps/CodeShop.cs
+++ b/ShiftOS.Frontend/Apps/CodeShop.cs
@@ -8,6 +8,8 @@ using ShiftOS.Frontend.GraphicsSubsystem;
 
 namespace ShiftOS.Frontend.Apps
 {
+    [Launcher("Shiftorium", false, null, "Utilities")]
+    [DefaultTitle("Shiftorium")]
     [WinOpen("shiftorium")]
     public class CodeShop : GUI.Control, IShiftOSWindow
     {
diff --git a/ShiftOS.Frontend/Apps/Pong.cs b/ShiftOS.Frontend/Apps/Pong.cs
index aed7cf1..eafe1bb 100644
--- a/ShiftOS.Frontend/Apps/Pong.cs
+++ b/ShiftOS.Frontend/Apps/Pong.cs
@@ -9,7 +9,7 @@ using ShiftOS.Frontend.GraphicsSubsystem;
 
 namespace ShiftOS.Frontend.Apps
 {
-    [Launcher("{TITLE_PONG}", true, "al_pong", "{AL_GAMES}")]
+    [Launcher("{TITLE_PONG}", false, null, "{AL_GAMES}")]
     [WinOpen("{WO_PONG}")]
     [DefaultTitle("{TITLE_PONG}")]
     [DefaultIcon("iconPong")]
diff --git a/ShiftOS.Frontend/Apps/SystemStatus.cs b/ShiftOS.Frontend/Apps/SystemStatus.cs
new file mode 100644
index 0000000..9add92b
--- /dev/null
+++ b/ShiftOS.Frontend/Apps/SystemStatus.cs
@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ShiftOS.Engine;
+using ShiftOS.Frontend.Desktop;
+using ShiftOS.Frontend.GraphicsSubsystem;
+
+namespace ShiftOS.Frontend.Apps
+{
+    [WinOpen("systemstatus")]
+    [Launcher("System Status", false, null, "System")]
+    [DefaultTitle("System Status")]
+    [SidePanel]
+    public class SystemStatus : GUI.Control, IShiftOSWindow
+    {
+        GUI.TextControl _header = null;
+        GUI.TextControl _mainstatus = null;
+
+        public SystemStatus()
+        {
+            Width = 720;
+            Height = 480;
+            _header = new GUI.TextControl();
+            _mainstatus = new GUI.TextControl();
+            AddControl(_header);
+            AddControl(_mainstatus);
+            _header.AutoSize = true;
+            _header.Text = "System Status";
+            
+        }
+
+        public void OnLoad()
+        {
+        }
+
+        public void OnSkinLoad()
+        {
+        }
+
+        public bool OnUnload()
+        {
+            return true;
+        }
+
+        public void OnUpgrade()
+        {
+        }
+
+        protected override void OnLayout()
+        {
+            _header.Font = SkinEngine.LoadedSkin.HeaderFont;
+            _header.X = 20;
+            _header.Y = 20;
+            _mainstatus.X = 20;
+            _mainstatus.Y = _header.Y + _header.Height + 10;
+            _mainstatus.Width = Width - 40;
+            _mainstatus.Height = Height - (_header.Y + _header.Height) - 40;
+            _mainstatus.Text = $@"Codepoints: {SaveSystem.CurrentSave.Codepoints}
+Upgrades: {SaveSystem.CurrentSave.CountUpgrades()} installed, {Shiftorium.GetDefaults().Count} available
+Filesystems:
+";
+
+            foreach(var mount in Objects.ShiftFS.Utils.Mounts)
+            {
+                _mainstatus.Text += $" - {Objects.ShiftFS.Utils.Mounts.IndexOf(mount)}:/ ({mount.Name}){Environment.NewLine}"; 
+            }
+            _mainstatus.Text += $@"
+
+Username: {SaveSystem.CurrentSave.Username}
+System name: {SaveSystem.CurrentSave.SystemName}
+RAM usage: 0MB/0MB <nyi>
+Open programs: {AppearanceManager.OpenForms.Count}";
+        }
+
+        protected override void OnPaint(GraphicsContext gfx)
+        {
+            base.OnPaint(gfx);
+
+        }
+    }
+}
diff --git a/ShiftOS.Frontend/Apps/Terminal.cs b/ShiftOS.Frontend/Apps/Terminal.cs
index 67c7f7f..ea75f3a 100644
--- a/ShiftOS.Frontend/Apps/Terminal.cs
+++ b/ShiftOS.Frontend/Apps/Terminal.cs
@@ -39,12 +39,9 @@ namespace ShiftOS.Frontend.Apps
             TerminalBackend.PrintPrompt();
             SaveSystem.GameReady += () =>
             {
-                if (Shiftorium.UpgradeInstalled("desktop"))
-                {
-                    AppearanceManager.Close(this);
-                }
-                else
-                    TerminalBackend.PrintPrompt();
+                Console.WriteLine("[sessionmgr] Starting system UI...");
+                AppearanceManager.SetupWindow(new SystemStatus());
+                TerminalBackend.PrintPrompt();
             };
         }
 
@@ -214,7 +211,7 @@ namespace ShiftOS.Frontend.Apps
                     {
                         if (TerminalBackend.PrefixEnabled)
                         {
-                            text3 = text4.Remove(0, $"{SaveSystem.CurrentUser.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ".Length);
+                            text3 = text4.Remove(0, $"{SaveSystem.CurrentSave.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ".Length);
                         }
                         TerminalBackend.LastCommand = text3;
                         TerminalBackend.SendText(text4);
@@ -250,7 +247,7 @@ namespace ShiftOS.Frontend.Apps
                 {
                     var tostring3 = Lines[Lines.Length - 1];
                     var tostringlen = tostring3.Length + 1;
-                    var workaround = $"{SaveSystem.CurrentUser.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ";
+                    var workaround = $"{SaveSystem.CurrentSave.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ";
                     var derp = workaround.Length + 1;
                     if (tostringlen != derp)
                     {
@@ -271,7 +268,7 @@ namespace ShiftOS.Frontend.Apps
                 {
                     var getstring = Lines[Lines.Length - 1];
                     var stringlen = getstring.Length + 1;
-                    var header = $"{SaveSystem.CurrentUser.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ";
+                    var header = $"{SaveSystem.CurrentSave.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ";
                     var headerlen = header.Length + 1;
                     var selstart = Index;
                     var remstrlen = Text.Length - stringlen;
@@ -287,7 +284,7 @@ namespace ShiftOS.Frontend.Apps
             else if (a.Key == Keys.Up)
             {
                 var tostring3 = Lines[Lines.Length - 1];
-                if (tostring3 == $"{SaveSystem.CurrentUser.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ")
+                if (tostring3 == $"{SaveSystem.CurrentSave.Username}@{SaveSystem.CurrentSave.SystemName}:~$ ")
                     Console.Write(TerminalBackend.LastCommand);
                 ConsoleEx.OnFlush?.Invoke();
                 return;