diff --git a/GoOS/BetterConsole/BetterConsole.cs b/GoOS/BetterConsole/BetterConsole.cs index e78e113913..14ddaa6ce3 100644 --- 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; /// @@ -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 index 5bf0d18007..efc0706cfc 100644 --- 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); } } } \ No newline at end of file diff --git a/GoOS/GUI/Apps/GoStore/MainFrame.cs b/GoOS/GUI/Apps/GoStore/MainFrame.cs index 78decaf4e2..a27cac2cda 100644 --- 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 index e3d6897f98..6ca73a3b7a 100644 --- 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 new file mode 100644 index 0000000000..6af31539c8 --- /dev/null +++ b/GoOS/GUI/Apps/Settings/Frame.cs @@ -0,0 +1,707 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Net.Sockets; +using System.Text; +using Cosmos.System.Network.Config; +using Cosmos.System.Network.IPv4; +using Cosmos.System.Network.IPv4.UDP.DNS; +using Cosmos.System.ScanMaps; +using GoGL.Graphics; + +namespace GoOS.GUI.Apps.Settings; + +public class Frame : Window +{ + List