Merge pull request #107 from Owen2k6/1.5

1.5

.gitignore

@@ -34,3 +34,17 @@ GoOS/obj/GoOS.csproj.nuget.g.props
 GoOS/obj/GoOS.csproj.nuget.g.targets
 GoOS/obj/project.assets.json
 GoOS/obj/project.nuget.cache
+GoOS/obj/Debug/net6.0/GoOS.assets.cache
+GoOS/obj/Debug/net6.0/GoOS.csproj.AssemblyReference.cache
+GoOS/obj/GoOS.csproj.nuget.dgspec.json
+GoOS/obj/GoOS.csproj.nuget.g.props
+GoOS/obj/GoOS.csproj.nuget.g.targets
+GoOS/obj/project.assets.json
+GoOS/obj/project.nuget.cache
+GoOS/obj/Debug/net6.0/GoOS.assets.cache
+GoOS/obj/Debug/net6.0/GoOS.csproj.AssemblyReference.cache
+GoOS/obj/GoOS.csproj.nuget.dgspec.json
+GoOS/obj/GoOS.csproj.nuget.g.props
+GoOS/obj/GoOS.csproj.nuget.g.targets
+GoOS/obj/project.assets.json
+GoOS/obj/project.nuget.cache

GoOS/9xCode/Interpreter.cs

@@ -3,11 +3,12 @@
 using System.IO;
 using System.Text;
 using System.Threading;
+using Cosmos.System;
 using GoOS.GUI;
-using PrismAPI.Graphics;
+using GoGL.Graphics;
 using static ConsoleColorEx;
 using Console = BetterConsole;
-using ConsoleColor = PrismAPI.Graphics.Color;
+using ConsoleColor = GoGL.Graphics.Color;
 using static GoOS.Resources;
 
 // 9xCode Beta 3.1
@@ -60,6 +61,8 @@ private static void Interpret(string[] code)
                     {
                         WindowManager.Update(); // Don't lock the WM
 
+                        if (KeyboardManager.TryReadKey(out var k) && k.Modifiers == ConsoleModifiers.Control && k.Key == ConsoleKeyEx.C) return;
+
                         string line = code[i].Trim().Replace("\\n", "\n");
 
                         #region Globals

GoOS/9xCode/StringToConsoleColor.cs

@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using ConsoleColor = PrismAPI.Graphics.Color;
+using ConsoleColor = GoGL.Graphics.Color;
 using static ConsoleColorEx;
 
 namespace GoOS._9xCode

GoOS/BetterConsole/BetterConsole.cs

@@ -4,13 +4,13 @@
 using Cosmos.System;
 using GoOS.GUI;
 using GoOS.Themes;
-using PrismAPI.Graphics;
+using GoGL.Graphics;
 using static GoOS.Resources;
 
 /// <summary>
 /// <see cref="BetterConsole"/> class
 /// </summary>
-public static class BetterConsole
+public static class BetterConsole //Shitter Console
 {
     /* The canvas for the console */
     public static Canvas Canvas;

GoOS/BetterConsole/VMBetterConsole.cs

@@ -5,13 +5,13 @@
 using GoOS.GUI;
 using GoOS.Themes;
 using IL2CPU.API.Attribs;
-using PrismAPI.Graphics;
-using PrismAPI.Graphics.Fonts;
+using GoGL.Graphics;
+using GoGL.Graphics.Fonts;
 
 /// <summary>
 /// <see cref="VMBetterConsole"/> class
 /// </summary>
-public class VMBetterConsole
+public class VMBetterConsole //Shitter Console
 {
     /* The raw global font */
     [ManifestResourceStream(ResourceName = "GoOS.Resources.Font_1x.btf")]

GoOS/Commands/Delete.cs

@@ -43,7 +43,7 @@ public static void DeleteFile(string args)
             ;
         }
 
-        public static void UniveralDelete(string args)
+        public static void UniversalDelete(string args)
         {
             if (args.Contains("0:\\"))
             {

GoOS/Commands/ExtendedFilesystem.cs

@@ -23,9 +23,9 @@ public static void CopyFile(string from, string to)
 
             string name = FullName.Substring(FullName.IndexOf("."));
 
-            var Contents = File.ReadAllText(from);
+            var Contents = File.ReadAllBytes(from);
             File.Create(to + FullName);
-            File.WriteAllText(to + FullName, Contents);
+            File.WriteAllBytes(to + FullName, Contents);
         }
         else
         {
@@ -34,9 +34,9 @@ public static void CopyFile(string from, string to)
 
             string name = FullName.Substring(FullName.IndexOf("."));
 
-            var Contents = File.ReadAllText(from);
+            var Contents = File.ReadAllBytes(from);
             File.Create(to + FullName);
-            File.WriteAllText(to + FullName, Contents);
+            File.WriteAllBytes(to + FullName, Contents);
         }
     }
 
@@ -50,9 +50,9 @@ public static void MoveFile(string from, string to)
 
             string name = FullName.Substring(FullName.IndexOf("."));
 
-            var Contents = File.ReadAllText(from);
+            var Contents = File.ReadAllBytes(from);
             File.Create(to + FullName);
-            File.WriteAllText(to + FullName, Contents);
+            File.WriteAllBytes(to + FullName, Contents);
             File.Delete(from);
         }
         else
@@ -61,9 +61,9 @@ public static void MoveFile(string from, string to)
 
             string name = FullName.Substring(FullName.IndexOf("."));
 
-            var Contents = File.ReadAllText(from);
+            var Contents = File.ReadAllBytes(from);
             File.Create(to + FullName);
-            File.WriteAllText(to + FullName, Contents);
+            File.WriteAllBytes(to + FullName, Contents);
             File.Delete(from);
         }
     }

GoOS/Commands/dir.cs

@@ -36,7 +36,7 @@ public static void Run()
 
                 foreach (var file in directory_list)
                 {
-                    if (file.EndsWith(".gms"))
+                    if (file.EndsWith(".gms") && !Kernel.devMode)
                     {
                         log(ThemeManager.ErrorText, "<System> Protected File");
                     }

GoOS/Core.cs

@@ -1,6 +1,6 @@
 using System.Threading;
 using Console = BetterConsole;
-using ConsoleColor = PrismAPI.Graphics.Color;
+using ConsoleColor = GoGL.Graphics.Color;
 
 namespace GoOS
 {

GoOS/GUI/Apps/About.cs

@@ -4,8 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using IL2CPU.API.Attribs;
-using PrismAPI.Graphics;
-using PrismAPI.UI;
+using GoGL.Graphics;
 
 namespace GoOS.GUI.Apps
 {

GoOS/GUI/Apps/AppManager.cs

@@ -1,6 +1,6 @@
 using System;
 using IL2CPU.API.Attribs;
-using PrismAPI.Graphics;
+using GoGL.Graphics;
 using static GoOS.Resources;
 
 namespace GoOS.GUI.Apps
@@ -72,6 +72,18 @@ public AppManager()
                     Image = GoStoreicon,
                     Clicked = Store_Click
                 },
+#if BUILD_GOWEB
+                new Button(this, 84, 100, 64, 80, "GoWeb")
+                {
+                    UseSystemStyle = false,
+                    BackgroundColour = Color.LightGray,
+                    SelectionColour = new Color(100, 100, 100),
+                    TextColour = Color.White,
+
+                    Image = goWebIcon,
+                    Clicked = GoWeb_Click
+                },
+#endif
             };
             CloseButton = new Button(this, Convert.ToUInt16(Contents.Width - 90), Convert.ToUInt16(Contents.Height - 30), 80, 20, "Close") { Clicked = CloseButton_Click };
 
@@ -93,6 +105,10 @@ public AppManager()
 
         private void Store_Click() => WindowManager.AddWindow(new GoStore.MainFrame());
 
+#if BUILD_GOWEB
+        private void GoWeb_Click() => WindowManager.AddWindow(new GoWeb.GoWebWindow());
+#endif
+
         private void CloseButton_Click() => Dispose();
     }
 }

GoOS/GUI/Apps/Clock.cs

@@ -4,8 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using IL2CPU.API.Attribs;
-using PrismAPI.Graphics;
-using PrismAPI.UI;
+using GoGL.Graphics;
 using static GoOS.Resources;
 
 namespace GoOS.GUI.Apps

GoOS/GUI/Apps/CustomInterface.cs

@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using IL2CPU.API.Attribs;
-using PrismAPI.Graphics;
+using GoGL.Graphics;
 using static GoOS.Resources;
 
 namespace GoOS.GUI.Apps

GoOS/GUI/Apps/Cut.cs

@@ -5,7 +5,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using IL2CPU.API.Attribs;
-using PrismAPI.Graphics;
+using GoGL.Graphics;
 using System.IO;
 using System.Threading;
 using static GoOS.Resources;