piwalker/ryujinx-ryubing
1
0
Fork 0
mirror of https://git.ryujinx.app/ryubing/ryujinx.git synced 2025-09-12 22:52:17 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'update/avalonia' into 'master'

Browse Source 
UI: Update Avalonia to 11.3.5, FluentAvalonia to 2.4.0

See merge request [ryubing/ryujinx!118](https://git.ryujinx.app/ryubing/ryujinx/-/merge_requests/118)
This commit is contained in:
KeatonTheBot
2025-09-12 09:37:59 -05:00
parent df40a69872 7a465caf83
commit d01ffcf81c
13 changed files with 245 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Directory.Packages.props
View File

@ -3,25 +3,25 @@
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally> <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageVersion Include="Avalonia" Version="11.0.13" /> <PackageVersion Include="Avalonia" Version="11.3.5" />
<PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.0.13" /> <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.5" />
<PackageVersion Include="Avalonia.Desktop" Version="11.0.13" /> <PackageVersion Include="Avalonia.Desktop" Version="11.3.5" />
<PackageVersion Include="Avalonia.Diagnostics" Version="11.0.13" /> <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.5" />
<PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.0.13" /> <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.3.5" />
<PackageVersion Include="Avalonia.Svg" Version="11.0.0.19" /> <PackageVersion Include="Svg.Controls.Avalonia" Version="11.3.0.4" />
<PackageVersion Include="Avalonia.Svg.Skia" Version="11.0.0.19" /> <PackageVersion Include="Svg.Controls.Skia.Avalonia" Version="11.3.0.4" />
<PackageVersion Include="Microsoft.Build.Framework" Version="17.11.4" /> <PackageVersion Include="Microsoft.Build.Framework" Version="17.11.4" />
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.12.6" /> <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.12.6" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" /> <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="Projektanker.Icons.Avalonia" Version="9.4.0" /> <PackageVersion Include="Projektanker.Icons.Avalonia" Version="9.6.2" />
<PackageVersion Include="Projektanker.Icons.Avalonia.FontAwesome" Version="9.4.0"/> <PackageVersion Include="Projektanker.Icons.Avalonia.FontAwesome" Version="9.6.2"/>
<PackageVersion Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="9.4.0"/> <PackageVersion Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="9.6.2"/>
<PackageVersion Include="CommandLineParser" Version="2.9.1" /> <PackageVersion Include="CommandLineParser" Version="2.9.1" />
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0"/> <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0"/>
<PackageVersion Include="Concentus" Version="2.2.2" /> <PackageVersion Include="Concentus" Version="2.2.2" />
<PackageVersion Include="DiscordRichPresence" Version="1.6.1.70" /> <PackageVersion Include="DiscordRichPresence" Version="1.6.1.70" />
<PackageVersion Include="DynamicData" Version="9.4.1" /> <PackageVersion Include="DynamicData" Version="9.4.1" />
<PackageVersion Include="FluentAvaloniaUI" Version="2.0.5" /> <PackageVersion Include="FluentAvaloniaUI.NoAnim" Version="2.4.0-build2" />
<PackageVersion Include="Humanizer" Version="2.14.1" /> <PackageVersion Include="Humanizer" Version="2.14.1" />
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" /> <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" /> <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />

6
src/Ryujinx/Ryujinx.csproj
View File

@ -51,10 +51,10 @@
<PackageReference Include="Avalonia.Diagnostics" Condition="'$(Configuration)'=='Debug'" /> <PackageReference Include="Avalonia.Diagnostics" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Avalonia.Controls.DataGrid" /> <PackageReference Include="Avalonia.Controls.DataGrid" />
<PackageReference Include="Avalonia.Markup.Xaml.Loader" /> <PackageReference Include="Avalonia.Markup.Xaml.Loader" />
<PackageReference Include="Avalonia.Svg" /> <PackageReference Include="Svg.Controls.Avalonia" />
<PackageReference Include="Avalonia.Svg.Skia" /> <PackageReference Include="Svg.Controls.Skia.Avalonia" />
<PackageReference Include="DynamicData" /> <PackageReference Include="DynamicData" />
<PackageReference Include="FluentAvaloniaUI" /> <PackageReference Include="FluentAvaloniaUI.NoAnim" />
<PackageReference Include="CommandLineParser" /> <PackageReference Include="CommandLineParser" />
<PackageReference Include="CommunityToolkit.Mvvm" /> <PackageReference Include="CommunityToolkit.Mvvm" />
<PackageReference Include="DiscordRichPresence" /> <PackageReference Include="DiscordRichPresence" />

1
src/Ryujinx/UI/Views/Input/ControllerInputView.axaml.cs
View File

@ -5,6 +5,7 @@ using Avalonia.Input;
using Avalonia.Interactivity; using Avalonia.Interactivity;
using Avalonia.LogicalTree; using Avalonia.LogicalTree;
using Ryujinx.Ava.UI.Controls; using Ryujinx.Ava.UI.Controls;
using static Ryujinx.Ava.UI.Views.Input.ControllerInputView;
using Ryujinx.Ava.UI.Helpers; using Ryujinx.Ava.UI.Helpers;
using Ryujinx.Ava.UI.ViewModels.Input; using Ryujinx.Ava.UI.ViewModels.Input;
using Ryujinx.Common.Configuration.Hid.Controller; using Ryujinx.Common.Configuration.Hid.Controller;

23
src/Ryujinx/UI/Views/Settings/SettingsAudioView.axaml
View File

@ -35,18 +35,17 @@
Width="350" Width="350"
ToolTip.Tip="{ext:Locale AudioBackendTooltip}" ToolTip.Tip="{ext:Locale AudioBackendTooltip}"
HorizontalContentAlignment="Left"> HorizontalContentAlignment="Left">
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{ext:Locale SettingsTabSystemAudioBackendDummy}" /> Content="{ext:Locale SettingsTabSystemAudioBackendDummy}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem IsEnabled="{Binding IsOpenAlEnabled}"> IsEnabled="{Binding IsOpenAlEnabled}"
<TextBlock Text="{ext:Locale SettingsTabSystemAudioBackendOpenAL}" /> Content="{ext:Locale SettingsTabSystemAudioBackendOpenAL}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem IsEnabled="{Binding IsSoundIoEnabled}"> IsEnabled="{Binding IsSoundIoEnabled}"
<TextBlock Text="{ext:Locale SettingsTabSystemAudioBackendSoundIO}" /> Content="{ext:Locale SettingsTabSystemAudioBackendSoundIO}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem IsEnabled="{Binding IsSDL2Enabled}"> IsEnabled="{Binding IsSDL2Enabled}"
<TextBlock Text="{ext:Locale SettingsTabSystemAudioBackendSDL2}" /> Content="{ext:Locale SettingsTabSystemAudioBackendSDL2}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
<StackPanel Margin="10,0,0,0" Orientation="Horizontal"> <StackPanel Margin="10,0,0,0" Orientation="Horizontal">

17
src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml
View File

@ -55,19 +55,14 @@
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
Width="350"> Width="350">
<ComboBoxItem <ComboBoxItem
ToolTip.Tip="{ext:Locale MemoryManagerSoftwareTooltip}"> ToolTip.Tip="{ext:Locale MemoryManagerSoftwareTooltip}"
<TextBlock Content="{ext:Locale SettingsTabSystemMemoryManagerModeSoftware}" />
Text="{ext:Locale SettingsTabSystemMemoryManagerModeSoftware}" />
</ComboBoxItem>
<ComboBoxItem <ComboBoxItem
ToolTip.Tip="{ext:Locale MemoryManagerHostTooltip}"> ToolTip.Tip="{ext:Locale MemoryManagerHostTooltip}"
<TextBlock Text="{ext:Locale SettingsTabSystemMemoryManagerModeHost}" /> Content="{ext:Locale SettingsTabSystemMemoryManagerModeHost}" />
</ComboBoxItem>
<ComboBoxItem <ComboBoxItem
ToolTip.Tip="{ext:Locale MemoryManagerUnsafeTooltip}"> ToolTip.Tip="{ext:Locale MemoryManagerUnsafeTooltip}"
<TextBlock Content="{ext:Locale SettingsTabSystemMemoryManagerModeHostUnchecked}" />
Text="{ext:Locale SettingsTabSystemMemoryManagerModeHostUnchecked}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
<CheckBox IsChecked="{Binding UseHypervisor}" <CheckBox IsChecked="{Binding UseHypervisor}"

159
src/Ryujinx/UI/Views/Settings/SettingsGraphicsView.axaml
View File

@ -37,12 +37,12 @@
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
ToolTip.Tip="{ext:Locale SettingsTabGraphicsBackendTooltip}" ToolTip.Tip="{ext:Locale SettingsTabGraphicsBackendTooltip}"
SelectedIndex="{Binding GraphicsBackendIndex}"> SelectedIndex="{Binding GraphicsBackendIndex}">
<ComboBoxItem IsVisible="{Binding IsVulkanAvailable}"> <ComboBoxItem
<TextBlock Text="Vulkan" /> IsVisible="{Binding IsVulkanAvailable}"
</ComboBoxItem> Content="Vulkan" />
<ComboBoxItem IsEnabled="{Binding IsOpenGLAvailable}"> <ComboBoxItem
<TextBlock Text="OpenGL" /> IsEnabled="{Binding IsOpenGLAvailable}"
</ComboBoxItem> Content="OpenGL" />
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" IsVisible="{Binding IsVulkanSelected}"> <StackPanel Orientation="Horizontal" IsVisible="{Binding IsVulkanSelected}">
@ -65,15 +65,12 @@
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
ToolTip.Tip="{ext:Locale GalThreadingTooltip}" ToolTip.Tip="{ext:Locale GalThreadingTooltip}"
SelectedIndex="{Binding GraphicsBackendMultithreadingIndex}"> SelectedIndex="{Binding GraphicsBackendMultithreadingIndex}">
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{ext:Locale CommonAuto}" /> Content="{ext:Locale CommonAuto}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{ext:Locale CommonOff}" />
<TextBlock Text="{ext:Locale CommonOff}" /> <ComboBoxItem
</ComboBoxItem> Content="{ext:Locale CommonOn}" />
<ComboBoxItem>
<TextBlock Text="{ext:Locale CommonOn}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
@ -108,21 +105,16 @@
Width="350" Width="350"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
ToolTip.Tip="{ext:Locale ResolutionScaleTooltip}"> ToolTip.Tip="{ext:Locale ResolutionScaleTooltip}">
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{ext:Locale SettingsTabGraphicsResolutionScaleNative}" /> Content="{ext:Locale SettingsTabGraphicsResolutionScaleNative}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{ext:Locale SettingsTabGraphicsResolutionScale2x}" />
<TextBlock Text="{ext:Locale SettingsTabGraphicsResolutionScale2x}" /> <ComboBoxItem
</ComboBoxItem> Content="{ext:Locale SettingsTabGraphicsResolutionScale3x}" />
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{ext:Locale SettingsTabGraphicsResolutionScale3x}" /> Content="{ext:Locale SettingsTabGraphicsResolutionScale4x}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{ext:Locale SettingsTabGraphicsResolutionScaleCustom}" />
<TextBlock Text="{ext:Locale SettingsTabGraphicsResolutionScale4x}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabGraphicsResolutionScaleCustom}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
<ui:NumberBox <ui:NumberBox
Margin="10,0,0,0" Margin="10,0,0,0"
@ -150,24 +142,18 @@
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
ToolTip.Tip="{ext:Locale GraphicsAATooltip}" ToolTip.Tip="{ext:Locale GraphicsAATooltip}"
SelectedIndex="{Binding AntiAliasingEffect}"> SelectedIndex="{Binding AntiAliasingEffect}">
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelNone}" /> Content="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelNone}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="FXAA" />
<TextBlock Text="FXAA" /> <ComboBoxItem
</ComboBoxItem> Content="{ext:Locale SmaaLow}" />
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{ext:Locale SmaaLow}" /> Content="{ext:Locale SmaaMedium}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{ext:Locale SmaaHigh}" />
<TextBlock Text="{ext:Locale SmaaMedium}" /> <ComboBoxItem
</ComboBoxItem> Content="{ext:Locale SmaaUltra}" />
<ComboBoxItem>
<TextBlock Text="{ext:Locale SmaaHigh}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SmaaUltra}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
@ -184,18 +170,14 @@
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
ToolTip.Tip="{ext:Locale GraphicsScalingFilterTooltip}" ToolTip.Tip="{ext:Locale GraphicsScalingFilterTooltip}"
SelectedIndex="{Binding ScalingFilter}"> SelectedIndex="{Binding ScalingFilter}">
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{ext:Locale GraphicsScalingFilterBilinear}" /> Content="{ext:Locale GraphicsScalingFilterBilinear}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{ext:Locale GraphicsScalingFilterNearest}" />
<TextBlock Text="{ext:Locale GraphicsScalingFilterNearest}" /> <ComboBoxItem
</ComboBoxItem> Content="{ext:Locale GraphicsScalingFilterFsr}" />
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{ext:Locale GraphicsScalingFilterFsr}" /> Content="{ext:Locale GraphicsScalingFilterArea}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale GraphicsScalingFilterArea}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
<controls:SliderScroll Value="{Binding ScalingFilterLevel}" <controls:SliderScroll Value="{Binding ScalingFilterLevel}"
ToolTip.Tip="{ext:Locale GraphicsScalingFilterLevelTooltip}" ToolTip.Tip="{ext:Locale GraphicsScalingFilterLevelTooltip}"
@ -226,23 +208,16 @@
Width="350" Width="350"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
ToolTip.Tip="{ext:Locale AnisotropyTooltip}"> ToolTip.Tip="{ext:Locale AnisotropyTooltip}">
<ComboBoxItem> <ComboBoxItem
<TextBlock Content="{ext:Locale SettingsTabGraphicsAnisotropicFilteringAuto}" />
Text="{ext:Locale SettingsTabGraphicsAnisotropicFilteringAuto}" /> <ComboBoxItem
</ComboBoxItem> Content="{ext:Locale SettingsTabGraphicsAnisotropicFiltering2x}" />
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{ext:Locale SettingsTabGraphicsAnisotropicFiltering2x}" /> Content="{ext:Locale SettingsTabGraphicsAnisotropicFiltering4x}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{ext:Locale SettingsTabGraphicsAnisotropicFiltering8x}" />
<TextBlock Text="{ext:Locale SettingsTabGraphicsAnisotropicFiltering4x}" /> <ComboBoxItem
</ComboBoxItem> Content="{ext:Locale SettingsTabGraphicsAnisotropicFiltering16x}" />
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabGraphicsAnisotropicFiltering8x}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock
Text="{ext:Locale SettingsTabGraphicsAnisotropicFiltering16x}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
@ -254,24 +229,18 @@
Width="350" Width="350"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
ToolTip.Tip="{ext:Locale AspectRatioTooltip}"> ToolTip.Tip="{ext:Locale AspectRatioTooltip}">
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{ext:Locale SettingsTabGraphicsAspectRatio4x3}" /> Content="{ext:Locale SettingsTabGraphicsAspectRatio4x3}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{ext:Locale SettingsTabGraphicsAspectRatio16x9}" />
<TextBlock Text="{ext:Locale SettingsTabGraphicsAspectRatio16x9}" /> <ComboBoxItem
</ComboBoxItem> Content="{ext:Locale SettingsTabGraphicsAspectRatio16x10}" />
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{ext:Locale SettingsTabGraphicsAspectRatio16x10}" /> Content="{ext:Locale SettingsTabGraphicsAspectRatio21x9}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{ext:Locale SettingsTabGraphicsAspectRatio32x9}" />
<TextBlock Text="{ext:Locale SettingsTabGraphicsAspectRatio21x9}" /> <ComboBoxItem
</ComboBoxItem> Content="{ext:Locale SettingsTabGraphicsAspectRatioStretch}" />
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabGraphicsAspectRatio32x9}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabGraphicsAspectRatioStretch}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>

21
src/Ryujinx/UI/Views/Settings/SettingsLoggingView.axaml
View File

@ -101,19 +101,14 @@
Width="150" Width="150"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
ToolTip.Tip="{ext:Locale OpenGlLogLevel}"> ToolTip.Tip="{ext:Locale OpenGlLogLevel}">
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelNone}" /> Content="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelNone}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelError}" />
<TextBlock Text="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelError}" /> <ComboBoxItem
</ComboBoxItem> Content="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelPerformance}" />
<ComboBoxItem> <ComboBoxItem
<TextBlock Content="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelAll}" />
Text="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelPerformance}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabLoggingGraphicsBackendLogLevelAll}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>

15
src/Ryujinx/UI/Views/Settings/SettingsNetworkView.axaml
View File

@ -33,15 +33,12 @@
ToolTip.Tip="{ext:Locale MultiplayerModeTooltip}" ToolTip.Tip="{ext:Locale MultiplayerModeTooltip}"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
Width="250"> Width="250">
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{ext:Locale MultiplayerModeDisabled}" /> Content="{ext:Locale MultiplayerModeDisabled}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{ext:Locale MultiplayerModeLdnRyu}" />
<TextBlock Text="{ext:Locale MultiplayerModeLdnRyu}" /> <ComboBoxItem
</ComboBoxItem> Content="{ext:Locale MultiplayerModeLdnMitm}" />
<ComboBoxItem>
<TextBlock Text="{ext:Locale MultiplayerModeLdnMitm}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
<CheckBox Margin="10,0,0,0" IsChecked="{Binding DisableP2P}"> <CheckBox Margin="10,0,0,0" IsChecked="{Binding DisableP2P}">
<TextBlock Text="{ext:Locale MultiplayerDisableP2P}" <TextBlock Text="{ext:Locale MultiplayerDisableP2P}"

170
src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
View File

@ -42,27 +42,20 @@
SelectedIndex="{Binding Region}" SelectedIndex="{Binding Region}"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
Width="350"> Width="350">
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{ext:Locale SettingsTabSystemSystemRegionJapan}" /> Content="{ext:Locale SettingsTabSystemSystemRegionJapan}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{ext:Locale SettingsTabSystemSystemRegionUSA}" />
<TextBlock Text="{ext:Locale SettingsTabSystemSystemRegionUSA}" /> <ComboBoxItem
</ComboBoxItem> Content="{ext:Locale SettingsTabSystemSystemRegionEurope}" />
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{ext:Locale SettingsTabSystemSystemRegionEurope}" /> Content="{ext:Locale SettingsTabSystemSystemRegionAustralia}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{ext:Locale SettingsTabSystemSystemRegionChina}" />
<TextBlock Text="{ext:Locale SettingsTabSystemSystemRegionAustralia}" /> <ComboBoxItem
</ComboBoxItem> Content="{ext:Locale SettingsTabSystemSystemRegionKorea}" />
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{ext:Locale SettingsTabSystemSystemRegionChina}" /> Content="{ext:Locale SettingsTabSystemSystemRegionTaiwan}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemSystemRegionKorea}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemSystemRegionTaiwan}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
<StackPanel <StackPanel
@ -76,60 +69,42 @@
SelectedIndex="{Binding Language}" SelectedIndex="{Binding Language}"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
Width="350"> Width="350">
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageJapanese}" /> Content="{ext:Locale SettingsTabSystemSystemLanguageJapanese}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{ext:Locale SettingsTabSystemSystemLanguageAmericanEnglish}" />
<TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageAmericanEnglish}" /> <ComboBoxItem
</ComboBoxItem> Content="{ext:Locale SettingsTabSystemSystemLanguageFrench}" />
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageFrench}" /> Content="{ext:Locale SettingsTabSystemSystemLanguageGerman}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{ext:Locale SettingsTabSystemSystemLanguageItalian}" />
<TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageGerman}" /> <ComboBoxItem
</ComboBoxItem> Content="{ext:Locale SettingsTabSystemSystemLanguageSpanish}" />
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageItalian}" /> Content="{ext:Locale SettingsTabSystemSystemLanguageChinese}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{ext:Locale SettingsTabSystemSystemLanguageKorean}" />
<TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageSpanish}" /> <ComboBoxItem
</ComboBoxItem> Content="{ext:Locale SettingsTabSystemSystemLanguageDutch}" />
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageChinese}" /> Content="{ext:Locale SettingsTabSystemSystemLanguagePortuguese}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{ext:Locale SettingsTabSystemSystemLanguageRussian}" />
<TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageKorean}" /> <ComboBoxItem
</ComboBoxItem> Content="{ext:Locale SettingsTabSystemSystemLanguageTaiwanese}" />
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageDutch}" /> Content="{ext:Locale SettingsTabSystemSystemLanguageBritishEnglish}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{ext:Locale SettingsTabSystemSystemLanguageCanadianFrench}" />
<TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguagePortuguese}" /> <ComboBoxItem
</ComboBoxItem> Content="{ext:Locale SettingsTabSystemSystemLanguageLatinAmericanSpanish}" />
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageRussian}" /> Content="{ext:Locale SettingsTabSystemSystemLanguageSimplifiedChinese}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{ext:Locale SettingsTabSystemSystemLanguageTraditionalChinese}" />
<TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageTaiwanese}" /> <ComboBoxItem
</ComboBoxItem> Content="{ext:Locale SettingsTabSystemSystemLanguageBrazilianPortuguese}" />
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageBritishEnglish}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageCanadianFrench}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageLatinAmericanSpanish}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageSimplifiedChinese}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageTraditionalChinese}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageBrazilianPortuguese}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
<StackPanel <StackPanel
@ -208,15 +183,12 @@
ToolTip.Tip="{ext:Locale SettingsTabSystemVSyncModeTooltipCustom}" ToolTip.Tip="{ext:Locale SettingsTabSystemVSyncModeTooltipCustom}"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
Width="350"> Width="350">
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{ext:Locale SettingsTabSystemVSyncModeSwitch}" /> Content="{ext:Locale SettingsTabSystemVSyncModeSwitch}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{ext:Locale SettingsTabSystemVSyncModeUnbounded}" />
<TextBlock Text="{ext:Locale SettingsTabSystemVSyncModeUnbounded}" /> <ComboBoxItem
</ComboBoxItem> Content="{ext:Locale SettingsTabSystemVSyncModeCustom}" />
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemVSyncModeCustom}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
<ComboBox <ComboBox
IsVisible="{Binding !EnableCustomVSyncInterval}" IsVisible="{Binding !EnableCustomVSyncInterval}"
@ -224,12 +196,10 @@
ToolTip.Tip="{ext:Locale SettingsTabSystemVSyncModeTooltip}" ToolTip.Tip="{ext:Locale SettingsTabSystemVSyncModeTooltip}"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
Width="350"> Width="350">
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{ext:Locale SettingsTabSystemVSyncModeSwitch}" /> Content="{ext:Locale SettingsTabSystemVSyncModeSwitch}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{ext:Locale SettingsTabSystemVSyncModeUnbounded}" />
<TextBlock Text="{ext:Locale SettingsTabSystemVSyncModeUnbounded}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
<StackPanel IsVisible="{Binding EnableCustomVSyncInterval}" <StackPanel IsVisible="{Binding EnableCustomVSyncInterval}"
@ -288,18 +258,14 @@
ToolTip.Tip="{ext:Locale DRamTooltip}" ToolTip.Tip="{ext:Locale DRamTooltip}"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
Width="350"> Width="350">
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{ext:Locale SettingsTabSystemDramSize4GiB}" /> Content="{ext:Locale SettingsTabSystemDramSize4GiB}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{ext:Locale SettingsTabSystemDramSize6GiB}" />
<TextBlock Text="{ext:Locale SettingsTabSystemDramSize6GiB}" /> <ComboBoxItem
</ComboBoxItem> Content="{ext:Locale SettingsTabSystemDramSize8GiB}" />
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{ext:Locale SettingsTabSystemDramSize8GiB}" /> Content="{ext:Locale SettingsTabSystemDramSize12GiB}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabSystemDramSize12GiB}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
<StackPanel <StackPanel

72
src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
View File

@ -71,22 +71,16 @@
<ComboBox SelectedIndex="{Binding FocusLostActionType}" <ComboBox SelectedIndex="{Binding FocusLostActionType}"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
MinWidth="100"> MinWidth="100">
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypeDoNothing}" /> Content="{ext:Locale SettingsTabGeneralFocusLossTypeDoNothing}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{ext:Locale SettingsTabGeneralFocusLossTypeBlockInput}" />
<TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypeBlockInput}" /> <ComboBoxItem
</ComboBoxItem> Content="{ext:Locale SettingsTabGeneralFocusLossTypeMuteAudio}" />
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypeMuteAudio}" /> Content="{ext:Locale SettingsTabGeneralFocusLossTypeBlockInputAndMuteAudio}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{ext:Locale SettingsTabGeneralFocusLossTypePauseEmulation}" />
<TextBlock
Text="{ext:Locale SettingsTabGeneralFocusLossTypeBlockInputAndMuteAudio}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabGeneralFocusLossTypePauseEmulation}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
<StackPanel <StackPanel
@ -100,16 +94,12 @@
<ComboBox SelectedIndex="{Binding UpdateCheckerType}" <ComboBox SelectedIndex="{Binding UpdateCheckerType}"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
MinWidth="100"> MinWidth="100">
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchOff}" /> Content="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchOff}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchPromptAtStartup}" />
<TextBlock <ComboBoxItem
Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchPromptAtStartup}" /> Content="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchBackground}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchBackground}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
<TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" /> <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
</StackPanel> </StackPanel>
@ -122,15 +112,12 @@
<ComboBox SelectedIndex="{Binding HideCursor}" <ComboBox SelectedIndex="{Binding HideCursor}"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
MinWidth="100"> MinWidth="100">
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{ext:Locale SettingsTabGeneralHideCursorNever}" /> Content="{ext:Locale SettingsTabGeneralHideCursorNever}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{ext:Locale SettingsTabGeneralHideCursorOnIdle}" />
<TextBlock Text="{ext:Locale SettingsTabGeneralHideCursorOnIdle}" /> <ComboBoxItem
</ComboBoxItem> Content="{ext:Locale SettingsTabGeneralHideCursorAlways}" />
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabGeneralHideCursorAlways}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
<StackPanel <StackPanel
@ -145,15 +132,12 @@
<ComboBox SelectedIndex="{Binding BaseStyleIndex}" <ComboBox SelectedIndex="{Binding BaseStyleIndex}"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
MinWidth="100"> MinWidth="100">
<ComboBoxItem> <ComboBoxItem
<TextBlock Text="{ext:Locale SettingsTabGeneralThemeAuto}" /> Content="{ext:Locale SettingsTabGeneralThemeAuto}" />
</ComboBoxItem> <ComboBoxItem
<ComboBoxItem> Content="{ext:Locale SettingsTabGeneralThemeLight}" />
<TextBlock Text="{ext:Locale SettingsTabGeneralThemeLight}" /> <ComboBoxItem
</ComboBoxItem> Content="{ext:Locale SettingsTabGeneralThemeDark}" />
<ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabGeneralThemeDark}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
<TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" /> <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
</StackPanel> </StackPanel>

20
src/Ryujinx/UI/Views/User/UserEditorView.axaml
View File

@ -92,20 +92,24 @@
Spacing="10"> Spacing="10">
<Button <Button
Name="DeleteButton" Name="DeleteButton"
Click="DeleteButton_Click" Click="DeleteButton_Click">
Content="{ext:Locale UserProfilesDelete}" /> <TextBlock Text="{ext:Locale UserProfilesDelete}" />
</Button>
<Button <Button
Name="ChangePictureButton" Name="ChangePictureButton"
Click="ChangePictureButton_Click" Click="ChangePictureButton_Click">
Content="{ext:Locale UserProfilesChangeProfileImage}" /> <TextBlock Text="{ext:Locale UserProfilesChangeProfileImage}" />
</Button>
<Button <Button
Name="AddPictureButton" Name="AddPictureButton"
Click="ChangePictureButton_Click" Click="ChangePictureButton_Click">
Content="{ext:Locale UserProfilesSetProfileImage}" /> <TextBlock Text="{ext:Locale UserProfilesSetProfileImage}" />
</Button>
<Button <Button
Name="SaveButton" Name="SaveButton"
Click="SaveButton_Click" Click="SaveButton_Click">
Content="{ext:Locale Save}" /> <TextBlock Text="{ext:Locale UserProfilesSetProfileImage}" />
</Button>
</StackPanel> </StackPanel>
</Grid> </Grid>
</UserControl> </UserControl>

47
src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml
View File

@ -22,45 +22,34 @@
<Grid RowDefinitions="Auto,*,Auto"> <Grid RowDefinitions="Auto,*,Auto">
<Grid <Grid
Grid.Row="0" Grid.Row="0"
Margin="0,0,0,5"
HorizontalAlignment="Stretch" ColumnDefinitions="Auto,*"> HorizontalAlignment="Stretch" ColumnDefinitions="Auto,*">
<StackPanel <StackPanel
Spacing="10" Spacing="10"
Orientation="Horizontal" Orientation="Horizontal"
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Center"> VerticalAlignment="Center">
<Label Content="{ext:Locale CommonSort}" VerticalAlignment="Center" /> <TextBlock Text="{ext:Locale CommonSort}" VerticalAlignment="Center" />
<ComboBox SelectedIndex="{Binding SortIndex}" Width="100"> <ComboBox SelectedIndex="{Binding SortIndex}"
<ComboBoxItem> HorizontalContentAlignment="Left"
<Label MinWidth="100">
VerticalAlignment="Center" <ComboBoxItem
HorizontalContentAlignment="Left" Content="{ext:Locale Name}" />
Content="{ext:Locale Name}" /> <ComboBoxItem
</ComboBoxItem> Content="{ext:Locale Size}" />
<ComboBoxItem>
<Label
VerticalAlignment="Center"
HorizontalContentAlignment="Left"
Content="{ext:Locale Size}" />
</ComboBoxItem>
<ComboBox.Styles> <ComboBox.Styles>
<Style Selector="ContentControl#ContentPresenter"> <Style Selector="ContentControl#ContentPresenter">
<Setter Property="HorizontalAlignment" Value="Left" /> <Setter Property="HorizontalAlignment" Value="Left" />
</Style> </Style>
</ComboBox.Styles> </ComboBox.Styles>
</ComboBox> </ComboBox>
<ComboBox SelectedIndex="{Binding OrderIndex}" Width="150"> <ComboBox SelectedIndex="{Binding OrderIndex}"
<ComboBoxItem> HorizontalContentAlignment="Left"
<Label MinWidth="150">
VerticalAlignment="Center" <ComboBoxItem
HorizontalContentAlignment="Left" Content="{ext:Locale OrderAscending}" />
Content="{ext:Locale OrderAscending}" /> <ComboBoxItem
</ComboBoxItem> Content="{ext:Locale OrderDescending}" />
<ComboBoxItem>
<Label
VerticalAlignment="Center"
HorizontalContentAlignment="Left"
Content="{ext:Locale OrderDescending}" />
</ComboBoxItem>
<ComboBox.Styles> <ComboBox.Styles>
<Style Selector="ContentControl#ContentPresenter"> <Style Selector="ContentControl#ContentPresenter">
<Setter Property="HorizontalAlignment" Value="Left" /> <Setter Property="HorizontalAlignment" Value="Left" />
@ -72,9 +61,9 @@
Grid.Column="1" Grid.Column="1"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
Margin="10,0, 0, 0" ColumnDefinitions="Auto,*"> Margin="10,0, 0, 0" ColumnDefinitions="Auto,*">
<Label Content="{ext:Locale Search}" VerticalAlignment="Center" /> <TextBlock Text="{ext:Locale Search}" VerticalAlignment="Center" />
<TextBox <TextBox
Margin="5,0,0,0" Margin="10,0,0,0"
Grid.Column="1" Grid.Column="1"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
Text="{Binding Search}" /> Text="{Binding Search}" />

15
src/Ryujinx/UI/Views/User/UserSelectorView.axaml
View File

@ -136,11 +136,13 @@
Orientation="Horizontal" Orientation="Horizontal"
Spacing="10"> Spacing="10">
<Button <Button
Click="ManageSaves" Click="ManageSaves">
Content="{ext:Locale UserProfilesManageSaves}" /> <TextBlock Text="{ext:Locale UserProfilesManageSaves}" />
</Button>
<Button <Button
Click="RecoverLostAccounts" Click="RecoverLostAccounts">
Content="{ext:Locale UserProfilesRecoverLostAccounts}" /> <TextBlock Text="{ext:Locale UserProfilesRecoverLostAccounts}" />
</Button>
</StackPanel> </StackPanel>
<StackPanel <StackPanel
Grid.Row="1" Grid.Row="1"
@ -148,8 +150,9 @@
HorizontalAlignment="Right" HorizontalAlignment="Right"
Orientation="Horizontal"> Orientation="Horizontal">
<Button <Button
Click="Close" Click="Close">
Content="{ext:Locale UserProfilesClose}" /> <TextBlock Text="{ext:Locale UserProfilesClose}" />
</Button>
</StackPanel> </StackPanel>
</Grid> </Grid>
</UserControl> </UserControl>