Merge pull request #110 from Owen2k6/1.5

1.5.3
Owen2k6 · Mar 21, 2024 · 405dc3c · 405dc3c
2 parents 3b91af6 + 5c718f6
commit 405dc3c
Show file tree

Hide file tree

Showing 23 changed files with 1,093 additions and 985 deletions.
diff --git a/GoOS/BetterConsole/BetterConsole.cs b/GoOS/BetterConsole/BetterConsole.cs
@@ -5,6 +5,7 @@
 using GoOS.GUI;
 using GoOS.Themes;
 using GoGL.Graphics;
+using GoOS.GUI.Apps.Settings;
 using static GoOS.Resources;
 
 /// <summary>
@@ -330,7 +331,7 @@ public static string ReadLine()
 
                                     case ConsoleKeyEx.Enter:
                                         if (MenuOptions[selected] == MenuOptions[0])
-                                            GoOS.ControlPanel.Launch();
+                                            WindowManager.AddWindow(new Frame());
                                         else if (MenuOptions[selected] == MenuOptions[1])
                                             Power.Reboot();
                                         break;

diff --git a/GoOS/GUI/Apps/About.cs b/GoOS/GUI/Apps/About.cs
@@ -22,10 +22,10 @@ public About()
             SetDock(WindowDock.Auto);
             // Paint the window.
             Contents.DrawImage(0, 0, Resources.abtbg, false);
-            Contents.DrawString(10, 152,  "GoOS "+Kernel.version, Resources.Font_1x, Color.White);
-            Contents.DrawString(10, 164,  "GoGL "+new GoGL.Info().getVersion(), Resources.Font_1x, Color.White);
-            Contents.DrawString(10, 176,  "GoCode "+GoCode.GoCode.Version, Resources.Font_1x, Color.White);
-            Contents.DrawString(10, 188,  "9xCode "+Interpreter.Version, Resources.Font_1x, Color.White);
+            Contents.DrawString(10, 152, "GoOS " + Kernel.version, Resources.Font_1x, Color.White);
+            Contents.DrawString(10, 164, "GoGL " + new GoGL.Info().getVersion(), Resources.Font_1x, Color.White);
+            Contents.DrawString(10, 176, "GoCode " + GoCode.GoCode.Version, Resources.Font_1x, Color.White);
+            Contents.DrawString(10, 188, "9xCode " + Interpreter.Version, Resources.Font_1x, Color.White);
         }
     }
 }
diff --git a/GoOS/GUI/Apps/GoStore/MainFrame.cs b/GoOS/GUI/Apps/GoStore/MainFrame.cs
@@ -15,6 +15,7 @@ public class MainFrame : Window
         Button[] catagoryButtons;
         Button[] _repoFilesButtons;
         string[] Catagories;
+        public static string Version = "1.0";
 
         private int catagory = 0;
         private int page = 0;

diff --git a/GoOS/GUI/Apps/GoWeb/GoWebWindow.cs b/GoOS/GUI/Apps/GoWeb/GoWebWindow.cs
@@ -8,6 +8,7 @@ namespace GoOS.GUI.Apps.GoWeb
 {
     public class GoWebWindow : Window
     {
+        public static string Version = "0.1.0";
         readonly Input AddressBar;
 
         readonly Button HomeButton;

diff --git a/GoOS/GUI/Apps/Settings/Frame.cs b/GoOS/GUI/Apps/Settings/Frame.cs
diff --git a/GoOS/GUI/Apps/StartMenu.cs b/GoOS/GUI/Apps/StartMenu.cs
@@ -10,6 +10,7 @@
 using IL2CPU.API.Attribs;
 using GoGL.Graphics;
 using GoGL.Hardware.GPU;
+using GoOS.GUI.Apps.Settings;
 using static GoOS.Resources;
 
 namespace GoOS.GUI.Apps
@@ -115,8 +116,7 @@ private void AddSideButtons()
             });
             AddSideButton("Settings", () =>
             {
-                WindowManager.AddWindow(new GTerm());
-                ControlPanel.Launch();
+                WindowManager.AddWindow(new Frame());
                 Dispose();
             });
             AddSideButton("Paint", () =>

diff --git a/GoOS/GUI/Dialogue.cs b/GoOS/GUI/Dialogue.cs
@@ -29,6 +29,7 @@ public static Dialogue Show(string title, string message, List<DialogueButton> b
         {
             // TODO: finish overrides
 
+            Kernel.InfoSound();
             var dialogue = new Dialogue(title, message, buttons, icon);
             WindowManager.AddWindow(dialogue);
             WindowManager.Update();

diff --git a/GoOS/GUI/Window.cs b/GoOS/GUI/Window.cs
@@ -207,7 +207,7 @@ internal void HandleMouseInput()
 
                 Dragging = false;
             }
-            
+
             if (MouseManager.MouseState == MouseState.None && previousMouseState == MouseState.Right)
             {
                 ShowContextMenu();
@@ -229,7 +229,7 @@ internal void HandleMouseInput()
             {
                 wasDown = true;
                 downOnControl = hoveredControl;
-                
+
                 HandleDown(new MouseEventArgs()
                 {
                     X = RelativeMouseX,
@@ -403,7 +403,7 @@ protected void ShowAboutDialog(string version)
         {
             Dialogue.Show(
                 $"About {Title}",
-                $"GoOS {Title} v{version}\n\nCopyright (c) "+Kernel.Copyright+ "Owen2k6\nAll rights reserved.",
+                $"GoOS {Title} v{version}\n\nCopyright (c) " + Kernel.Copyright + "Owen2k6\nAll rights reserved.",
                 null,
                 heightOverride: 144);
         }

diff --git a/GoOS/GUI/WindowManager.cs b/GoOS/GUI/WindowManager.cs
@@ -352,7 +352,7 @@ public static void Update()
                     {
                         GetWindowByType<StartMenu>().Dispose();
                     }
-                    
+
                     if (MouseManager.ScreenWidth != Canvas.Width || MouseManager.ScreenHeight != Canvas.Height)
                     {
                         MouseManager.ScreenWidth = Canvas.Width;
-Original file line number
+Diff line change
@@ Expand Up / @@ -352,7 +352,7 @@ public static void Update() @@
                         {
                             GetWindowByType<StartMenu>().Dispose();
                         }
                         if (MouseManager.ScreenWidth != Canvas.Width || MouseManager.ScreenHeight != Canvas.Height)
                         {
                             MouseManager.ScreenWidth = Canvas.Width;
@@ Expand Down @@