diff --git a/.gitignore b/.gitignore index a7041fa0..d3fd5a86 100644 --- a/.gitignore +++ b/.gitignore @@ -52,6 +52,8 @@ ipch/ *.sdf *.cachefile +version.txt + # Visual Studio profiler *.psess *.vsp diff --git a/AmongUsCapture/AmongUsCapture.csproj b/AmongUsCapture/AmongUsCapture.csproj index 1011462d..1e543949 100644 --- a/AmongUsCapture/AmongUsCapture.csproj +++ b/AmongUsCapture/AmongUsCapture.csproj @@ -20,6 +20,7 @@ + diff --git a/AmongUsCapture/UserForm.cs b/AmongUsCapture/UserForm.cs index 40417ba4..f96389a4 100644 --- a/AmongUsCapture/UserForm.cs +++ b/AmongUsCapture/UserForm.cs @@ -93,6 +93,8 @@ private void _primaryWindowMenuItemAbout_Activated(object o, EventArgs e) about.Name = "_amonguscaptureGtkAboutDialog"; about.ProgramName = "Among Us Capture (GTK)"; string version = String.Empty; + string master = String.Empty; + using(Stream stream = Assembly.GetExecutingAssembly() .GetManifestResourceStream("amonguscapture_gtk.version.txt")) if (stream == null) @@ -104,13 +106,28 @@ private void _primaryWindowMenuItemAbout_Activated(object o, EventArgs e) version = sreader.ReadToEnd(); } } + + using(Stream stream = Assembly.GetExecutingAssembly() + .GetManifestResourceStream("amonguscapture_gtk.master.txt")) + { + // Contains the original tag/hash from the source build. + using (StreamReader sreader = new StreamReader(stream)) + { + master = sreader.ReadToEnd(); + } + } + about.Icon = abouticon; about.Version = version; - about.Comments = "amonguscapture_gtk is a GTK version of the Among Us Capture utility made by denverquane."; + about.Authors = new[] {"TauAkiou (GTK Port)", "denverquane (Original Version)", "Other Contributors"}; + about.Comments = "amonguscapture_gtk is a GTK version of the Among Us Capture utility." + + $"\n\nBased on amonguscapture {master}"; about.Website = "https://github.com/TauAkiou/amonguscapture-gtk"; about.Logo = abouticon; + about.Present(); about.Run(); + about.Dispose(); diff --git a/AmongUsCapture/Userform.Gtk.cs b/AmongUsCapture/Userform.Gtk.cs index d4e209bc..a4513540 100644 --- a/AmongUsCapture/Userform.Gtk.cs +++ b/AmongUsCapture/Userform.Gtk.cs @@ -75,6 +75,7 @@ public void InitializeWindow() _primaryWindowMenuFile = new Menu(); _primaryWindowMenuQuitItem = new MenuItem(); + _primaryMenuItemAbout = new MenuItem(); // Top level window pane. @@ -130,6 +131,7 @@ public void InitializeWindow() _primaryWindowMenuBar.Name = "_primaryWindowMenuBar"; _primaryWindowMenuBar.Append(_primaryMenuItemFile); + _primaryWindowMenuBar.Append(_primaryMenuItemAbout); _primaryMenuItemFile.Name = "_primaryMenuItemFile"; _primaryMenuItemFile.Label = "File"; diff --git a/AmongUsCapture/master.txt b/AmongUsCapture/master.txt new file mode 100644 index 00000000..7db431f6 --- /dev/null +++ b/AmongUsCapture/master.txt @@ -0,0 +1 @@ +2.0.7-83-g127ced7 \ No newline at end of file diff --git a/README.md b/README.md index f6e29094..e1c8b32a 100644 --- a/README.md +++ b/README.md @@ -3,12 +3,43 @@ Capture of the local Among Us executable state -The amonguscapture-gtk project brings the amonguscapture utility to other platforms by removing the Windows dependent WinForms framework and replacing it with the open-source GTK framework (https://www.gtk.org/). +The amonguscapture-gtk project brings the amonguscapture utility to other platforms by removing the Windows dependent WinForms framework and replacing it with the open-source GTK framework (https://www.gtk.org/). AmongusCapture-gtk is currently supported under: * Windows * Linux -While AmongUsCapture-gtk works under Windows, we recommmend using the [official release](https://github.com/denverquane/amonguscapture). +##Requirements: +###Windows: + +While you can use amonguscapture-gtk under Windows, we recommend using the [official release](https://github.com/denverquane/amonguscapture). + +* .NET Core 3.1 Runtime: https://dotnet.microsoft.com/download/dotnet-core/current/runtime +* GTK For Windows Runtime: https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer + +###Linux: + +* .NET Core 3.1: https://docs.microsoft.com/en-us/dotnet/core/install/linux +* GTK3: Check your distribution's packaging manager for information on how to install. If you already have Gnome installed, you likely already have gtk3. + +##Building + + + +###Windows + + +* .NET Core SDK: https://dotnet.microsoft.com/download +* Visual Studio + - Loading the 'AmongUsCapture.sln' file and building should be sufficient enough - all packages should be downloaded from NuGet. + +###Linux +* .NET Core 3.1 SDK: https://docs.microsoft.com/en-us/dotnet/core/install/linux +* GTK3 development libraries: Check your distribution's packaging manager for information on how to install. + +####Instructions: + - git clone https://github.com/TauAkiou/amonguscapture-gtk/tree/linux-mem-new + + If you are using a non-master repository, switch to the correct