From e92af1bc7fe5cd5860206061f4ff261b3339cc51 Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 13 Jul 2017 08:40:47 -0400 Subject: SidePanel system, system status, crapton of other neat things --- ShiftOS.Frontend/Apps/Terminal.cs | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'ShiftOS.Frontend/Apps/Terminal.cs') 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; -- cgit v1.2.3