diff options
| author | gdkchan <gab.dark.100@gmail.com> | 2023-11-11 23:35:30 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-11 23:35:30 -0300 |
| commit | 51065d91290e41a9d2518f44c9bdf83a9b0017ab (patch) | |
| tree | 4964520c8d5dbb1000b8eec4a024744df1a3e4ee /src/Ryujinx.Ava/UI/Models | |
| parent | 6228331fd1fb63a32d929bf1cae7f709bc9fd271 (diff) | |
Revert "Add support for multi game XCIs (#5638)" (#5914)
This reverts commit 5c3cfb84c09b0566da677425915afa0b2d76da55.
Diffstat (limited to 'src/Ryujinx.Ava/UI/Models')
| -rw-r--r-- | src/Ryujinx.Ava/UI/Models/DownloadableContentModel.cs | 6 | ||||
| -rw-r--r-- | src/Ryujinx.Ava/UI/Models/SaveModel.cs | 4 | ||||
| -rw-r--r-- | src/Ryujinx.Ava/UI/Models/TitleUpdateModel.cs | 5 |
3 files changed, 4 insertions, 11 deletions
diff --git a/src/Ryujinx.Ava/UI/Models/DownloadableContentModel.cs b/src/Ryujinx.Ava/UI/Models/DownloadableContentModel.cs index e39ffead..fedb3527 100644 --- a/src/Ryujinx.Ava/UI/Models/DownloadableContentModel.cs +++ b/src/Ryujinx.Ava/UI/Models/DownloadableContentModel.cs @@ -1,5 +1,4 @@ -using Ryujinx.Ava.Common.Locale; -using Ryujinx.Ava.UI.ViewModels; +using Ryujinx.Ava.UI.ViewModels; using System.IO; namespace Ryujinx.Ava.UI.Models @@ -25,9 +24,6 @@ namespace Ryujinx.Ava.UI.Models public string FileName => Path.GetFileName(ContainerPath); - public string Label => - Path.GetExtension(FileName)?.ToLower() == ".xci" ? $"{LocaleManager.Instance[LocaleKeys.TitleBundledDlcLabel]} {FileName}" : FileName; - public DownloadableContentModel(string titleId, string containerPath, string fullPath, bool enabled) { TitleId = titleId; diff --git a/src/Ryujinx.Ava/UI/Models/SaveModel.cs b/src/Ryujinx.Ava/UI/Models/SaveModel.cs index 2e3ed3ba..7b476932 100644 --- a/src/Ryujinx.Ava/UI/Models/SaveModel.cs +++ b/src/Ryujinx.Ava/UI/Models/SaveModel.cs @@ -46,14 +46,14 @@ namespace Ryujinx.Ava.UI.Models TitleId = info.ProgramId; UserId = info.UserId; - var appData = MainWindow.MainWindowViewModel.Applications.FirstOrDefault(x => x.IdString.ToUpper() == TitleIdString); + var appData = MainWindow.MainWindowViewModel.Applications.FirstOrDefault(x => x.TitleId.ToUpper() == TitleIdString); InGameList = appData != null; if (InGameList) { Icon = appData.Icon; - Title = appData.Name; + Title = appData.TitleName; } else { diff --git a/src/Ryujinx.Ava/UI/Models/TitleUpdateModel.cs b/src/Ryujinx.Ava/UI/Models/TitleUpdateModel.cs index fae2a08d..3b44e8ee 100644 --- a/src/Ryujinx.Ava/UI/Models/TitleUpdateModel.cs +++ b/src/Ryujinx.Ava/UI/Models/TitleUpdateModel.cs @@ -8,10 +8,7 @@ namespace Ryujinx.Ava.UI.Models public ApplicationControlProperty Control { get; } public string Path { get; } - public string Label => LocaleManager.Instance.UpdateAndGetDynamicValue( - System.IO.Path.GetExtension(Path)?.ToLower() == ".xci" ? LocaleKeys.TitleBundledUpdateVersionLabel : LocaleKeys.TitleUpdateVersionLabel, - Control.DisplayVersionString.ToString() - ); + public string Label => LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.TitleUpdateVersionLabel, Control.DisplayVersionString.ToString()); public TitleUpdateModel(ApplicationControlProperty control, string path) { |