diff --git a/PS2_Manager/AddGameWindow.axaml b/PS2_Manager/AddGameWindow.axaml index f61bbc0..d5aa042 100644 --- a/PS2_Manager/AddGameWindow.axaml +++ b/PS2_Manager/AddGameWindow.axaml @@ -28,7 +28,7 @@ - + diff --git a/PS2_Manager/Assets/cd.png b/PS2_Manager/Assets/cd.png new file mode 100644 index 0000000..9979a34 Binary files /dev/null and b/PS2_Manager/Assets/cd.png differ diff --git a/PS2_Manager/Assets/dvd.png b/PS2_Manager/Assets/dvd.png new file mode 100644 index 0000000..3e6ea01 Binary files /dev/null and b/PS2_Manager/Assets/dvd.png differ diff --git a/PS2_Manager/Images/missing.png b/PS2_Manager/Assets/missing.png similarity index 100% rename from PS2_Manager/Images/missing.png rename to PS2_Manager/Assets/missing.png diff --git a/PS2_Manager/Images/vmc.png b/PS2_Manager/Assets/vmc.png similarity index 100% rename from PS2_Manager/Images/vmc.png rename to PS2_Manager/Assets/vmc.png diff --git a/PS2_Manager/Core/DiscType.cs b/PS2_Manager/Core/DiscType.cs new file mode 100644 index 0000000..bc305cf --- /dev/null +++ b/PS2_Manager/Core/DiscType.cs @@ -0,0 +1,35 @@ +using System; +using Avalonia; +using Avalonia.Media.Imaging; +using Avalonia.Platform; + +namespace PS2_Manager.Core; + + +public class DiscIcon +{ + public bool ShowDVD { get; set; } + public bool ShowCD { get; set; } + public DiscType type { get; set; } + + public DiscIcon(DiscType _type) + { + this.type = _type; + if (type == DiscType.CD) + { + this.ShowCD = true; + this.ShowDVD = false; + }else if (type == DiscType.DVD) + { + this.ShowCD = false; + this.ShowDVD = true; + } + } +} + + +public enum DiscType +{ + DVD, + CD +} \ No newline at end of file diff --git a/PS2_Manager/Core/Game.cs b/PS2_Manager/Core/Game.cs index fa9f36b..f03d97a 100644 --- a/PS2_Manager/Core/Game.cs +++ b/PS2_Manager/Core/Game.cs @@ -23,6 +23,7 @@ public class Game public Bitmap? ArtworkBack { get; set; } public Bitmap? ArtworkDVD { get; set; } public Config? Config { get; set; } + public DiscIcon Icon { get; set; } public EventHandler? InstallationFinished { get; set; } public UpdateVar InstallProgress { get; private set; } @@ -30,6 +31,7 @@ public class Game { this.GamePath = isoPath; this.GameID = ISO.GetSerial(isoPath); + this.Icon = new DiscIcon(DiscType.DVD); this.Config = new Config(this.GetConfigPath()); if (!installed) { diff --git a/PS2_Manager/MainWindow.axaml b/PS2_Manager/MainWindow.axaml index 3aea29b..9d638d9 100644 --- a/PS2_Manager/MainWindow.axaml +++ b/PS2_Manager/MainWindow.axaml @@ -11,7 +11,6 @@ Height="520" MinHeight="490" MinWidth="875" - Resized="WindowBase_OnResized" WindowStartupLocation="CenterScreen" Loaded="Control_OnLoaded" Foreground="White"> @@ -30,7 +29,11 @@ - + + + + + @@ -97,13 +100,13 @@ - + - + @@ -152,7 +155,7 @@ - + diff --git a/PS2_Manager/MainWindow.axaml.cs b/PS2_Manager/MainWindow.axaml.cs index 63ab94d..349983b 100644 --- a/PS2_Manager/MainWindow.axaml.cs +++ b/PS2_Manager/MainWindow.axaml.cs @@ -353,11 +353,6 @@ public partial class MainWindow : Window this.ArtworkType.Value = Artwork.PrevType(this.ArtworkType.Value); } - private void WindowBase_OnResized(object? sender, WindowResizedEventArgs e) - { - VanillaConsole.WriteLine(e.ClientSize); - } - private void VMC_1_OnSelectionChanged(object? sender, SelectionChangedEventArgs e) { @@ -395,21 +390,27 @@ public partial class MainWindow : Window { case "toggle_mode1": selectedGame.Config.Mode1 = toggle_mode1.IsChecked.Value; + Console.Warning("Toggled Mode 1 for " + selectedGame.GameID + " to " + selectedGame.Config.Mode1); break; case "toggle_mode2": selectedGame.Config.Mode2 = toggle_mode2.IsChecked.Value; + Console.Warning("Toggled Mode 2 for " + selectedGame.GameID + " to " + selectedGame.Config.Mode2); break; case "toggle_mode3": selectedGame.Config.Mode3 = toggle_mode3.IsChecked.Value; + Console.Warning("Toggled Mode 3 for " + selectedGame.GameID + " to " + selectedGame.Config.Mode3); break; case "toggle_mode4": selectedGame.Config.Mode4 = toggle_mode4.IsChecked.Value; + Console.Warning("Toggled Mode 4 for " + selectedGame.GameID + " to " + selectedGame.Config.Mode4); break; case "toggle_mode5": selectedGame.Config.Mode5 = toggle_mode5.IsChecked.Value; + Console.Warning("Toggled Mode 5 for " + selectedGame.GameID + " to " + selectedGame.Config.Mode5); break; case "toggle_mode6": selectedGame.Config.Mode6 = toggle_mode6.IsChecked.Value; + Console.Warning("Toggled Mode 6 for " + selectedGame.GameID + " to " + selectedGame.Config.Mode6); break; } } diff --git a/PS2_Manager/PS2_Manager.csproj b/PS2_Manager/PS2_Manager.csproj index 764bb64..9c36232 100644 --- a/PS2_Manager/PS2_Manager.csproj +++ b/PS2_Manager/PS2_Manager.csproj @@ -24,8 +24,12 @@ - + - + + + + +