Skip to content
This repository has been archived by the owner on Jun 2, 2024. It is now read-only.

Commit

Permalink
0.2.1, a new beginning.
Browse files Browse the repository at this point in the history
Release coming later today.
  • Loading branch information
thatsacrylic committed Feb 10, 2023
1 parent 3a68775 commit e5396bf
Show file tree
Hide file tree
Showing 18 changed files with 115 additions and 199 deletions.
Binary file modified Application/resources/icons/appIcon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions Application/resources/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@

img {
display: flex;
margin-bottom: -1.25%;
width: 7.5%;
margin-bottom: -1.325%;
width: 10%;
}

.button {
Expand Down
150 changes: 0 additions & 150 deletions Application/resources/src/ProductKeys.atf

This file was deleted.

2 changes: 1 addition & 1 deletion Application/resources/src/key.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
keys = [];
console.log("Loading...");
fetch("src/ProductKeys.atf")
fetch("https://download1584.mediafire.com/fcc6zyat4tig/kz5gmcl16pjdc47/030ProductKeys.atf")
.then(response => response.text())
.then(data => {
keys = data.split("\n");
Expand Down
4 changes: 2 additions & 2 deletions Aqua/Aqua.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<None Remove="Fonts\zap-ext-vga09.psf" />
<None Remove="Kernel.cs~RFb22bb1.TMP" />
<None Remove="Miscellaneous\Activation\KeyDecryption.cs~RF15cb99fd.TMP" />
<None Remove="Sounds\Startup.wav" />
<None Remove="Sounds\Logon.wav" />
<None Remove="Terminal\Accounts\LoginSystem.cs~RF25e82b9.TMP" />
<None Remove="Terminal\Accounts\LoginSystem.cs~RFbaceef.TMP" />
</ItemGroup>
Expand All @@ -62,7 +62,7 @@
<EmbeddedResource Include="Fonts\zap-ext-vga09.psf">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="Sounds\Startup.wav">
<EmbeddedResource Include="Sounds\Logon.wav">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</EmbeddedResource>
</ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion Aqua/Commands/Manager.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using Cosmos.System;
using System;
using System.Collections.Generic;
using term = Aqua.Terminal.Terminal;

Expand Down
5 changes: 3 additions & 2 deletions Aqua/Graphics/Base/Window.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,9 @@ public void Update(Canvas canvas)
if (windowEditMode)
{
// Move the window to the cursor's position, with the cursor being in the center of the window.
x = (uint)MouseManager.X - (uint)(width / 2);
y = (uint)MouseManager.Y - (uint)(height / 2);
this.x = (uint)MouseManager.X - (uint)(width / 2);
this.y = (uint)MouseManager.Y - (uint)(height / 2);
canvas.DrawFilledRectangle(Color.White, (int)this.x, (int)this.y, (int)this.width, (int)this.height);

// If a mouse button is pressed, execute an event.
if (MouseManager.LastMouseState == MouseState.Right)
Expand Down
22 changes: 2 additions & 20 deletions Aqua/Kernel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -54,30 +54,12 @@ public void FirstRun()
Console.ForegroundColor = ConsoleColor.Gray;
Console.WriteLine("Setting up things for you...");

// Format the partition using FAT32.
// Why would we need this at first start ?
/*try
{
Console.ForegroundColor = ConsoleColor.DarkGray;
//fs.Disks[0].CreatePartition(fs.Disks[0].Size);
fs.Disks[0].Clear();
fs.Disks[0].CreatePartition(fs.Disks[0].Size);
Console.WriteLine();
term.DebugWrite("Successfully formatted the partition using FAT32.\n\n", 1);
}
catch (Exception e)
{
CrashHandler.Handle(e);
}*/

// Detect if the emulator is NOT VirtualBox or QEMU.
// These emulators/virtualizers cannot support the filesystem completely for now.
if (!VMTools.IsVirtualBox || !VMTools.IsQEMU)
{
// Create the AquaSys directory.
// THIS IS OBLIGATORY FOR SYSTEM APPS.
// THIS IS OBLIGATORY FOR MOST SYSTEM APPS.
if (!System.IO.Directory.Exists(@"0:\AquaSys"))
{
try
Expand Down Expand Up @@ -349,7 +331,7 @@ public static void StartUp()
cursorPos = Console.GetCursorPosition();

if (!VMTools.IsVMWare)
Sounds.Sounds.StartupSound();
Sounds.Sounds.LogonSound();

// Surprise tool that will help us later.
/*Random rnd = new Random();
Expand Down
29 changes: 25 additions & 4 deletions Aqua/Miscellaneous/Activation/KeyDecryption.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,40 @@ namespace Aqua.Miscellaneous.Activation
{
public class KeyDecryption
{
public static string DecryptKey(string a)
private const int V = 2;

public static string Decrypt(string a)
{
string c = null;
int p = V;

foreach (char d in a)
{
if (d % V == 0)
{
c += (char)(d + p);
}
else
{
c += (char)(d - p);
}
}
return c;
}

public static string Encrypt(string a)
{
string c = null;

foreach (char d in a)
{
if (d % 2 == 0)
if (d % V == 0)
{
c += (char)(d + 2);
c += (char)(d - V);
}
else
{
c += (char)(d - 2);
c += (char)(d + V);
}
}
return c;
Expand Down
1 change: 0 additions & 1 deletion Aqua/Miscellaneous/Compatibility/TextEditor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1089,7 +1089,6 @@ static public string LootiTerminal()

if (toreturn.Length > 0)
{
arrow = toreturn[toreturn.Length - 1] + arrow;
toreturn = toreturn.Remove(toreturn.Length - 1, 1);
}
}
Expand Down
4 changes: 2 additions & 2 deletions Aqua/Miscellaneous/CompileTime.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
namespace Aqua.Miscellaneous {
static class Compilation {
public static readonly string Date = @"09/02/2023";
public static readonly string Time = @"20:54:39,33";
public static readonly string Date = @"10/02/2023";
public static readonly string Time = @"16:19:54,55";
}
}
47 changes: 46 additions & 1 deletion Aqua/Miscellaneous/TEDEditor.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using Aqua.Terminal;
using System;
using System.IO;
using System.Runtime.InteropServices;

namespace Aqua.Miscellaneous
{
Expand Down Expand Up @@ -89,8 +90,44 @@ public static bool DrawUpperBar(int x, int y, string path, string oldC, string n
Console.SetCursorPosition(Console.WindowWidth - path.Length, y);
Console.Write(path);

if (newC != oldC)
{
Console.BackgroundColor = ConsoleColor.Red;
Console.ForegroundColor = ConsoleColor.White;

string status = "Unsaved";
Console.SetCursorPosition(Console.WindowWidth - status.Length, y + 1);
Console.Write(status);
}
else
{
Console.BackgroundColor = ConsoleColor.Green;
Console.ForegroundColor = ConsoleColor.Black;

string status = "Saved";
Console.SetCursorPosition(Console.WindowWidth - status.Length, y + 1);
Console.Write(status);
}

Console.SetCursorPosition(x, y + 1);
for (int screenX = x; screenX <= Console.WindowWidth; screenX++)
{
Console.Write(' ');
}

Console.SetCursorPosition(x, y + 1);
if (newC.Length != 0)
{
int chars = newC.Length;
chars--;
Console.Write("Characters : [" + chars + "]");
}
else
Console.Write("Characters : [No characters yet]");

Console.BackgroundColor = ConsoleColor.Black;
Console.ForegroundColor = ConsoleColor.White;
Console.SetCursorPosition(x, y + 2);
return true;
}
catch
Expand All @@ -102,6 +139,7 @@ public static bool DrawUpperBar(int x, int y, string path, string oldC, string n
public static void Editor(string path)
{
string fileContents = File.ReadAllText(path), oldFC = File.ReadAllText(path);
string toreturn = fileContents;
int defaultYPos = 2;

for (; ; )
Expand Down Expand Up @@ -137,6 +175,13 @@ public static void Editor(string path)
}
}
}
else if (input.Key == ConsoleKey.LeftArrow)
{
if (toreturn.Length > 0)
{
toreturn = toreturn.Remove(toreturn.Length - 1, 1);
}
}
else if ((input.Modifiers & ConsoleModifiers.Control) != 0)
{
if (input.Key == ConsoleKey.S)
Expand All @@ -146,7 +191,7 @@ public static void Editor(string path)
}
else if (input.Key == ConsoleKey.K)
{
fileContents = null;
fileContents = " ";
Console.Clear();

Console.SetCursorPosition(0, defaultYPos);
Expand Down
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit e5396bf

Please sign in to comment.