crafterpika/ryujinx
1
0
Fork 0
mirror of https://git.ryujinx.app/ryubing/ryujinx.git synced 2025-06-28 00:16:23 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'various-ui-fixes-and-improvements' into 'master'

Browse source 
Various UI Fixes and Improvements for XCI File Trimmer and Games Compatibility Window

See merge request [ryubing/ryujinx!35](https://git.ryujinx.app/ryubing/ryujinx/-/merge_requests/35)
This commit is contained in:
TheToid 2025-05-29 22:46:08 -05:00
commit 89d51fae1d
12 changed files with 190 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

50
assets/locales.json
View file

@ -3222,6 +3222,31 @@
"zh_TW": "正在修剪 XCI 檔案 '{0}'"
}
},
{
"ID": "StatusBarXCIFileScanning",
"Translations": {
"ar_SA": "",
"de_DE": "",
"el_GR": "",
"en_US": "Scanning XCI Files...",
"es_ES": "",
"fr_FR": "",
"he_IL": "",
"it_IT": "",
"ja_JP": "",
"ko_KR": "",
"no_NO": "",
"pl_PL": "",
"pt_BR": "",
"ru_RU": "",
"sv_SE": "",
"th_TH": "",
"tr_TR": "",
"uk_UA": "",
"zh_CN": "",
"zh_TW": ""
}
},
{
"ID": "LinuxVmMaxMapCountDialogTitle",
"Translations": {
@ -21297,6 +21322,31 @@
"zh_TW": "節省的儲存空間"
}
},
{
"ID": "XCITrimmerSortStatus",
"Translations": {
"ar_SA": "",
"de_DE": "",
"el_GR": "",
"en_US": "Status",
"es_ES": "",
"fr_FR": "",
"he_IL": "",
"it_IT": "",
"ja_JP": "",
"ko_KR": "",
"no_NO": "",
"pl_PL": "",
"pt_BR": "",
"ru_RU": "",
"sv_SE": "",
"th_TH": "",
"tr_TR": "",
"uk_UA": "",
"zh_CN": "",
"zh_TW": ""
}
},
{
"ID": "XCITrimmerTrim",
"Translations": {

2
src/Ryujinx.Common/Utilities/XCIFileTrimmer.cs
View file

@ -142,7 +142,6 @@ namespace Ryujinx.Common.Utilities
{
Log = log;
Filename = path;
ReadHeader();
}
public void CheckFreeSpace(CancellationToken? cancelToken = null)
@ -435,7 +434,6 @@ namespace Ryujinx.Common.Utilities
_binaryReader.Close();
_binaryReader = null;
_fileStream = null;
GC.Collect();
}
private void ReadHeader()

16
src/Ryujinx/Common/LocaleManager.cs
View file

@ -47,10 +47,18 @@ namespace Ryujinx.Ava.Common.Locale
private void Load()
{
string localeLanguageCode = !string.IsNullOrEmpty(ConfigurationState.Instance.UI.LanguageCode.Value) ?
ConfigurationState.Instance.UI.LanguageCode.Value : CultureInfo.CurrentCulture.Name.Replace('-', '_');
LoadLanguage(localeLanguageCode);
try
{
string localeLanguageCode = !string.IsNullOrEmpty(ConfigurationState.Instance.UI.LanguageCode.Value)
? ConfigurationState.Instance.UI.LanguageCode.Value
: CultureInfo.CurrentCulture.Name.Replace('-', '_');
LoadLanguage(localeLanguageCode);
}
catch
{
LoadLanguage(DefaultLanguageCode);
}
// Save whatever we ended up with.
if (Program.PreviewerDetached)

19
src/Ryujinx/UI/Helpers/Converters/XCITrimmerFileStatusConverter.cs
View file

@ -25,19 +25,26 @@ namespace Ryujinx.Ava.UI.Helpers
return null;
}
if (value is not XCITrimmerFileModel app)
if (value is not XCITrimmerFileModel model)
{
return null;
}
return app.PercentageProgress != null ? String.Empty :
app.ProcessingOutcome != OperationOutcome.Successful && app.ProcessingOutcome != OperationOutcome.Undetermined ? LocaleManager.Instance[LocaleKeys.TitleXCIStatusFailedLabel] :
app.Trimmable & app.Untrimmable ? LocaleManager.Instance[LocaleKeys.TitleXCIStatusPartialLabel] :
app.Trimmable ? LocaleManager.Instance[LocaleKeys.TitleXCIStatusTrimmableLabel] :
app.Untrimmable ? LocaleManager.Instance[LocaleKeys.TitleXCIStatusUntrimmableLabel] :
return model.PercentageProgress != null ? String.Empty :
model.ProcessingOutcome != OperationOutcome.Successful && model.ProcessingOutcome != OperationOutcome.Undetermined ? LocaleManager.Instance[LocaleKeys.TitleXCIStatusFailedLabel] :
model.Trimmable & model.Untrimmable ? LocaleManager.Instance[LocaleKeys.TitleXCIStatusPartialLabel] :
model.Trimmable ? LocaleManager.Instance[LocaleKeys.TitleXCIStatusTrimmableLabel] :
model.Untrimmable ? LocaleManager.Instance[LocaleKeys.TitleXCIStatusUntrimmableLabel] :
String.Empty;
}
public static string From(XCITrimmerFileModel model)
{
if (model == null) return String.Empty;
return (string)Instance.Convert(model, typeof(string), null, CultureInfo.CurrentUICulture) ?? String.Empty;
}
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
throw new NotSupportedException();

24
src/Ryujinx/UI/ViewModels/CompatibilityViewModel.cs
View file

@ -4,12 +4,15 @@ using Ryujinx.Ava.Systems.AppLibrary;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
namespace Ryujinx.Ava.UI.ViewModels
{
public class CompatibilityViewModel : BaseModel, IDisposable
{
private readonly ApplicationLibrary _appLibrary;
private string _search;
private Timer _searchTimer;
private IEnumerable<CompatibilityEntry> _currentEntries = CompatibilityDatabase.Entries;
private string[] _ownedGameTitleIds = [];
@ -54,7 +57,7 @@ namespace Ryujinx.Ava.UI.ViewModels
}
}
public void Search(string searchTerm)
private void UpdateSearch(string searchTerm)
{
if (string.IsNullOrEmpty(searchTerm))
{
@ -64,6 +67,9 @@ namespace Ryujinx.Ava.UI.ViewModels
SetEntries(CompatibilityDatabase.Entries.Where(x =>
x.GameName.ContainsIgnoreCase(searchTerm)
|| x.FormattedIssueLabels.ContainsIgnoreCase(searchTerm)
|| x.LocalizedStatus.ContainsIgnoreCase(searchTerm)
|| x.LocalizedStatusDescription.ContainsIgnoreCase(searchTerm)
|| x.TitleId.Check(tid => tid.ContainsIgnoreCase(searchTerm))));
}
@ -74,5 +80,21 @@ namespace Ryujinx.Ava.UI.ViewModels
#pragma warning restore MVVMTK0034
OnPropertyChanged(nameof(CurrentEntries));
}
public string Search
{
get => _search;
set
{
_search = value;
_searchTimer?.Dispose();
_searchTimer = new Timer(_ =>
{
UpdateSearch(_search);
_searchTimer.Dispose();
_searchTimer = null;
}, null, 250, 0);
}
}
}
}

2
src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
View file

@ -1873,7 +1873,7 @@ namespace Ryujinx.Ava.UI.ViewModels
}
}
public async void ProcessTrimResult(String filename, XCIFileTrimmer.OperationOutcome operationOutcome)
public async Task ProcessTrimResult(String filename, XCIFileTrimmer.OperationOutcome operationOutcome)
{
string notifyUser = operationOutcome.ToLocalisedText();

72
src/Ryujinx/UI/ViewModels/XciTrimmerViewModel.cs
View file

@ -8,6 +8,7 @@ using Ryujinx.Ava.Common.Models;
using Ryujinx.Ava.UI.Helpers;
using Ryujinx.Ava.Systems.AppLibrary;
using Ryujinx.Common.Utilities;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
@ -28,6 +29,7 @@ namespace Ryujinx.Ava.UI.ViewModels
public enum SortField
{
Name,
Status,
Saved
}
@ -42,6 +44,7 @@ namespace Ryujinx.Ava.UI.ViewModels
private MainWindowViewModel _mainWindowViewModel;
private CancellationTokenSource _cancellationTokenSource;
private string _search;
private Timer _searchTimer;
private ProcessingMode _processingMode;
private SortField _sortField = SortField.Name;
private bool _sortAscending = true;
@ -55,11 +58,39 @@ namespace Ryujinx.Ava.UI.ViewModels
private void LoadXCIApplications()
{
IEnumerable<ApplicationData> apps = ApplicationLibrary.Applications.Items
.Where(app => app.FileExtension == _FileExtXCI);
try
{
_mainWindowViewModel.StatusBarProgressStatusText = LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.StatusBarXCIFileScanning);
_mainWindowViewModel.StatusBarProgressStatusVisible = true;
_mainWindowViewModel.StatusBarProgressMaximum = 1;
_mainWindowViewModel.StatusBarProgressValue = 0;
_mainWindowViewModel.StatusBarVisible = true;
foreach (ApplicationData xciApp in apps)
AddOrUpdateXCITrimmerFile(CreateXCITrimmerFile(xciApp.Path));
IEnumerable<ApplicationData> apps = ApplicationLibrary.Applications.Items
.Where(app => app.FileExtension == _FileExtXCI).ToArray();
_mainWindowViewModel.StatusBarProgressMaximum = apps.Count();
_mainWindowViewModel.StatusBarProgressValue = 0;
int appsProcessed = 0;
foreach (ApplicationData xciApp in apps)
{
AddOrUpdateXCITrimmerFile(CreateXCITrimmerFile(xciApp.Path));
if (appsProcessed % 50 == 0)
{
_mainWindowViewModel.StatusBarProgressValue = appsProcessed;
Dispatcher.UIThread.InvokeAsync(() => { }, DispatcherPriority.Render).Wait();
}
appsProcessed++;
}
}
finally
{
_mainWindowViewModel.StatusBarProgressStatusVisible = false;
_mainWindowViewModel.StatusBarProgressStatusText = string.Empty;
_mainWindowViewModel.StatusBarVisible = false;
}
ApplicationsChanged();
}
@ -245,8 +276,9 @@ namespace Ryujinx.Ava.UI.ViewModels
if (arg is XCITrimmerFileModel content)
{
return string.IsNullOrWhiteSpace(_search)
|| content.Name.ToLower().Contains(_search.ToLower())
|| content.Path.ToLower().Contains(_search.ToLower());
|| content.Name.ContainsIgnoreCase(_search)
|| XCITrimmerFileStatusConverter.From(content).ContainsIgnoreCase(_search)
|| content.Path.ContainsIgnoreCase(_search);
}
return false;
@ -268,18 +300,24 @@ namespace Ryujinx.Ava.UI.ViewModels
switch (_viewModel.SortingField)
{
case SortField.Name:
result = x.Name.CompareTo(y.Name);
result = String.Compare(x?.Name ?? String.Empty, y?.Name ?? String.Empty, StringComparison.OrdinalIgnoreCase);
break;
case SortField.Status:
result = String.Compare(XCITrimmerFileStatusConverter.From(x), XCITrimmerFileStatusConverter.From(y), StringComparison.OrdinalIgnoreCase);
break;
case SortField.Saved:
result = x.PotentialSavingsB.CompareTo(y.PotentialSavingsB);
break;
}
if (!_viewModel.SortingAscending)
result = -result;
if (result == 0)
result = String.Compare(x?.Path ?? String.Empty, y?.Path ?? String.Empty, StringComparison.OrdinalIgnoreCase);
if (result == 0)
result = x.Path.CompareTo(y.Path);
result = String.Compare(x?.Name ?? String.Empty, y?.Name ?? String.Empty, StringComparison.OrdinalIgnoreCase);
if (!_viewModel.SortingAscending)
result = -result;
return result;
}
@ -446,7 +484,13 @@ namespace Ryujinx.Ava.UI.ViewModels
set
{
_search = value;
FilteringChanged();
_searchTimer?.Dispose();
_searchTimer = new Timer(_ =>
{
FilteringChanged();
_searchTimer.Dispose();
_searchTimer = null;
}, null, 250, 0);
}
}
@ -467,6 +511,7 @@ namespace Ryujinx.Ava.UI.ViewModels
return SortingField switch
{
SortField.Name => LocaleManager.Instance[LocaleKeys.XCITrimmerSortName],
SortField.Status => LocaleManager.Instance[LocaleKeys.XCITrimmerSortStatus],
SortField.Saved => LocaleManager.Instance[LocaleKeys.XCITrimmerSortSaved],
_ => string.Empty,
};
@ -487,6 +532,11 @@ namespace Ryujinx.Ava.UI.ViewModels
get => _sortField == SortField.Name;
}
public bool IsSortedByStatus
{
get => _sortField == SortField.Status;
}
public bool IsSortedBySaved
{
get => _sortField == SortField.Saved;

16
src/Ryujinx/UI/Views/Dialog/XciTrimmerView.axaml
View file

@ -45,13 +45,19 @@
Orientation="Vertical">
<StackPanel>
<RadioButton
Checked="Sort_Checked"
IsCheckedChanged="Sort_Checked"
Content="{ext:Locale XCITrimmerSortName}"
GroupName="Sort"
IsChecked="{Binding IsSortedByName, Mode=OneTime}"
Tag="Name" />
<RadioButton
Checked="Sort_Checked"
IsCheckedChanged="Sort_Checked"
Content="{ext:Locale XCITrimmerSortStatus}"
GroupName="Sort"
IsChecked="{Binding IsSortedByStatus, Mode=OneTime}"
Tag="Status" />
<RadioButton
IsCheckedChanged="Sort_Checked"
Content="{ext:Locale XCITrimmerSortSaved}"
GroupName="Sort"
IsChecked="{Binding IsSortedBySaved, Mode=OneTime}"
@ -67,13 +73,13 @@
<Separator Height="0" HorizontalAlignment="Stretch" />
</Border>
<RadioButton
Checked="Order_Checked"
IsCheckedChanged="Order_Checked"
Content="{ext:Locale OrderAscending}"
GroupName="Order"
IsChecked="{Binding SortingAscending, Mode=OneTime}"
Tag="Ascending" />
<RadioButton
Checked="Order_Checked"
IsCheckedChanged="Order_Checked"
Content="{ext:Locale OrderDescending}"
GroupName="Order"
IsChecked="{Binding !SortingAscending, Mode=OneTime}"
@ -151,7 +157,7 @@
HorizontalAlignment="Stretch"
VerticalAlignment="Center"
CornerRadius="5"
IsVisible="{Binding $parent[UserControl].((viewModels:XciTrimmerViewModel)DataContext).Processing}"
IsVisible="{Binding $parent[UserControl].((viewModels:XciTrimmerViewModel)DataContext).Processing, FallbackValue=False}"
Maximum="100"
Minimum="0"
Value="{Binding PercentageProgress}" />

18
src/Ryujinx/UI/Views/Dialog/XciTrimmerView.axaml.cs
View file

@ -62,14 +62,28 @@ namespace Ryujinx.Ava.UI.Views.Dialog
public void Sort_Checked(object sender, RoutedEventArgs args)
{
if (sender is RadioButton { Tag: string sortField })
if (sender is not RadioButton { Tag: string sortField, IsChecked: { } isChecked })
{
return;
}
if (isChecked)
{
ViewModel.SortingField = Enum.Parse<XciTrimmerViewModel.SortField>(sortField);
}
}
public void Order_Checked(object sender, RoutedEventArgs args)
{
if (sender is RadioButton { Tag: string sortOrder })
if (sender is not RadioButton { Tag: string sortOrder, IsChecked: { } isChecked })
{
return;
}
if (isChecked)
{
ViewModel.SortingAscending = sortOrder is "Ascending";
}
}
private void OnSelectionChanged(object sender, SelectionChangedEventArgs e)

2
src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml
View file

@ -86,7 +86,7 @@
Classes="withCheckbox"
Padding="0"
Icon="{ext:Icon fa-solid fa-expand}"
InputGesture="F11">
InputGesture="{OnPlatform Default='F11', macOS='ctrl+cmd+F'}">
</MenuItem>
<MenuItem
Padding="0"

4
src/Ryujinx/UI/Windows/CompatibilityListWindow.axaml
View file

@ -23,12 +23,12 @@
Grid.Column="0"
Margin="15, 0, 7, 0"
ToolTip.Tip="{ext:WindowTitle CompatibilityListTitle, False}"/>
<TextBox Name="SearchBoxFlush" Grid.Column="1" Margin="0, 5, 0, 5" HorizontalAlignment="Stretch" Watermark="{ext:Locale CompatibilityListSearchBoxWatermarkWithCount}" TextChanged="TextBox_OnTextChanged" />
<TextBox Name="SearchBoxFlush" Grid.Column="1" Margin="0, 5, 0, 5" HorizontalAlignment="Stretch" Watermark="{ext:Locale CompatibilityListSearchBoxWatermarkWithCount}" Text="{Binding Search}" />
<CheckBox Grid.Column="2" Margin="7, 0, 0, 0" IsChecked="{Binding OnlyShowOwnedGames}" />
<TextBlock Grid.Column="3" Padding="0, 0, 138, 0" Margin="-10, 0, 18, 0" Text="{ext:Locale CompatibilityListOnlyShowOwnedGames}" />
</Grid>
<Grid Grid.Row="0" ColumnDefinitions="*,Auto,Auto" Name="NormalControls">
<TextBox Name="SearchBoxNormal" Grid.Column="0" Margin="15, 0, 0, 5" HorizontalAlignment="Stretch" Watermark="{ext:Locale CompatibilityListSearchBoxWatermark}" TextChanged="TextBox_OnTextChanged" />
<TextBox Name="SearchBoxNormal" Grid.Column="0" Margin="15, 0, 0, 5" HorizontalAlignment="Stretch" Watermark="{ext:Locale CompatibilityListSearchBoxWatermark}" Text="{Binding Search}" />
<CheckBox Grid.Column="1" Margin="7, 0, 0, 0" IsChecked="{Binding OnlyShowOwnedGames}" />
<TextBlock Grid.Column="2" Padding="0, 0, 1, 0" Margin="-10, 0, 18, 0" Text="{ext:Locale CompatibilityListOnlyShowOwnedGames}" />
</Grid>

13
src/Ryujinx/UI/Windows/CompatibilityListWindow.axaml.cs
View file

@ -29,18 +29,5 @@ namespace Ryujinx.Ava.UI.Windows
FlushControls.IsVisible = !ConfigurationState.Instance.ShowOldUI;
NormalControls.IsVisible = ConfigurationState.Instance.ShowOldUI;
}
// ReSharper disable once UnusedMember.Local
// its referenced in the axaml but rider keeps yelling at me that its unused so
private void TextBox_OnTextChanged(object sender, TextChangedEventArgs e)
{
if (DataContext is not CompatibilityViewModel cvm)
return;
if (sender is not TextBox searchBox)
return;
cvm.Search(searchBox.Text);
}
}
}