From 46c8129bf57a3df3e0a2db27e6611ca4210614be Mon Sep 17 00:00:00 2001 From: Ac_K Date: Fri, 29 Jul 2022 00:41:34 +0200 Subject: Avalonia: Another Cleanup (#3494) * Avalonia: Another Cleanup This PR is a cleanup to the avalonia code recently added: - Some XAML file are autoformatted like a previous PR. - Dlc is renamed to DownloadableContent (Locale exclude). - DownloadableContentManagerWindow is a bit improved (Fixes #3491). - Some nits here and there. * Fix GTK * Remove AttachDebugDevTools * Fix last warning * Fix JSON fields --- Ryujinx.Ava/Ui/ViewModels/AmiiboWindowViewModel.cs | 4 ++-- Ryujinx.Ava/Ui/ViewModels/MainWindowViewModel.cs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'Ryujinx.Ava/Ui/ViewModels') diff --git a/Ryujinx.Ava/Ui/ViewModels/AmiiboWindowViewModel.cs b/Ryujinx.Ava/Ui/ViewModels/AmiiboWindowViewModel.cs index 7015df44..fc809e52 100644 --- a/Ryujinx.Ava/Ui/ViewModels/AmiiboWindowViewModel.cs +++ b/Ryujinx.Ava/Ui/ViewModels/AmiiboWindowViewModel.cs @@ -382,9 +382,9 @@ namespace Ryujinx.Ava.Ui.ViewModels { string amiiboJsonString = await response.Content.ReadAsStringAsync(); - using (FileStream dlcJsonStream = File.Create(_amiiboJsonPath, 4096, FileOptions.WriteThrough)) + using (FileStream amiiboJsonStream = File.Create(_amiiboJsonPath, 4096, FileOptions.WriteThrough)) { - dlcJsonStream.Write(Encoding.UTF8.GetBytes(amiiboJsonString)); + amiiboJsonStream.Write(Encoding.UTF8.GetBytes(amiiboJsonString)); } return amiiboJsonString; diff --git a/Ryujinx.Ava/Ui/ViewModels/MainWindowViewModel.cs b/Ryujinx.Ava/Ui/ViewModels/MainWindowViewModel.cs index 7e6452f9..bd9242e7 100644 --- a/Ryujinx.Ava/Ui/ViewModels/MainWindowViewModel.cs +++ b/Ryujinx.Ava/Ui/ViewModels/MainWindowViewModel.cs @@ -1261,15 +1261,15 @@ namespace Ryujinx.Ava.Ui.ViewModels } } - public async void OpenDlcManager() + public async void OpenDownloadableContentManager() { var selection = SelectedApplication; if (selection != null) { - DlcManagerWindow dlcManager = new(_owner.VirtualFileSystem, ulong.Parse(selection.TitleId, NumberStyles.HexNumber), selection.TitleName); + DownloadableContentManagerWindow downloadableContentManager = new(_owner.VirtualFileSystem, ulong.Parse(selection.TitleId, NumberStyles.HexNumber), selection.TitleName); - await dlcManager.ShowDialog(_owner); + await downloadableContentManager.ShowDialog(_owner); } } -- cgit v1.2.3