Superredstone/Kenji-NX
1
0
Fork 0
mirror of https://git.ryujinx.app/projects/Kenji-NX.git synced 2026-10-08 04:19:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "UI: Update Avalonia to 11.2.8, FluentAvalonia to 2.3.0"

Browse Source 
This reverts commit 01f037ae83.
This commit is contained in:
KeatonTheBot
2025-04-27 21:24:58 -05:00
parent 10c9e46fbe
commit b40265e029
12 changed files with 295 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Directory.Packages.props
+8 -8
View File
@@ -3,18 +3,18 @@
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally> <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageVersion Include="Avalonia" Version="11.2.8" /> <PackageVersion Include="Avalonia" Version="11.0.13" />
<PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.2.8" /> <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.0.13" />
<PackageVersion Include="Avalonia.Desktop" Version="11.2.8" /> <PackageVersion Include="Avalonia.Desktop" Version="11.0.13" />
<PackageVersion Include="Avalonia.Diagnostics" Version="11.2.8" /> <PackageVersion Include="Avalonia.Diagnostics" Version="11.0.13" />
<PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.2.8" /> <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.0.13" />
<PackageVersion Include="Avalonia.Svg" Version="11.2.7.1" /> <PackageVersion Include="Avalonia.Svg" Version="11.0.0.19" />
<PackageVersion Include="Avalonia.Svg.Skia" Version="11.2.7.1" /> <PackageVersion Include="Avalonia.Svg.Skia" Version="11.0.0.19" />
<PackageVersion Include="CommandLineParser" Version="2.9.1" /> <PackageVersion Include="CommandLineParser" Version="2.9.1" />
<PackageVersion Include="Concentus" Version="2.2.2" /> <PackageVersion Include="Concentus" Version="2.2.2" />
<PackageVersion Include="DiscordRichPresence" Version="1.2.1.24" /> <PackageVersion Include="DiscordRichPresence" Version="1.2.1.24" />
<PackageVersion Include="DynamicData" Version="9.0.4" /> <PackageVersion Include="DynamicData" Version="9.0.4" />
<PackageVersion Include="FluentAvaloniaUI.NoAnim" Version="2.3.0-build1" /> <PackageVersion Include="FluentAvaloniaUI" Version="2.0.5" />
<PackageVersion Include="Gommon" Version="2.7.1.1" /> <PackageVersion Include="Gommon" Version="2.7.1.1" />
<PackageVersion Include="GtkSharp.Dependencies" Version="1.1.1" /> <PackageVersion Include="GtkSharp.Dependencies" Version="1.1.1" />
<PackageVersion Include="GtkSharp.Dependencies.osx" Version="0.0.5" /> <PackageVersion Include="GtkSharp.Dependencies.osx" Version="0.0.5" />
src/Ryujinx/Ryujinx.csproj
+1 -1
View File
@@ -47,7 +47,7 @@
<PackageReference Include="Avalonia.Svg" /> <PackageReference Include="Avalonia.Svg" />
<PackageReference Include="Avalonia.Svg.Skia" /> <PackageReference Include="Avalonia.Svg.Skia" />
<PackageReference Include="DynamicData" /> <PackageReference Include="DynamicData" />
<PackageReference Include="FluentAvaloniaUI.NoAnim" /> <PackageReference Include="FluentAvaloniaUI" />
<PackageReference Include="OpenTK.Core" /> <PackageReference Include="OpenTK.Core" />
<PackageReference Include="Ryujinx.Audio.OpenAL.Dependencies" Condition="'$(RuntimeIdentifier)' == 'win-x64' OR '$(RuntimeIdentifier)' == 'win-arm64'" /> <PackageReference Include="Ryujinx.Audio.OpenAL.Dependencies" Condition="'$(RuntimeIdentifier)' == 'win-x64' OR '$(RuntimeIdentifier)' == 'win-arm64'" />
src/Ryujinx/UI/Views/Settings/SettingsAudioView.axaml
+12 -11
View File
@@ -34,17 +34,18 @@
<ComboBox SelectedIndex="{Binding AudioBackend}" <ComboBox SelectedIndex="{Binding AudioBackend}"
Width="350" Width="350"
HorizontalContentAlignment="Left"> HorizontalContentAlignment="Left">
<ComboBoxItem <ComboBoxItem>
Content="{locale:Locale SettingsTabSystemAudioBackendDummy}" /> <TextBlock Text="{locale:Locale SettingsTabSystemAudioBackendDummy}" />
<ComboBoxItem </ComboBoxItem>
IsEnabled="{Binding IsOpenAlEnabled}" <ComboBoxItem IsEnabled="{Binding IsOpenAlEnabled}">
Content="{locale:Locale SettingsTabSystemAudioBackendOpenAL}" /> <TextBlock Text="{locale:Locale SettingsTabSystemAudioBackendOpenAL}" />
<ComboBoxItem </ComboBoxItem>
IsEnabled="{Binding IsSoundIoEnabled}" <ComboBoxItem IsEnabled="{Binding IsSoundIoEnabled}">
Content="{locale:Locale SettingsTabSystemAudioBackendSoundIO}" /> <TextBlock Text="{locale:Locale SettingsTabSystemAudioBackendSoundIO}" />
<ComboBoxItem </ComboBoxItem>
IsEnabled="{Binding IsSDL2Enabled}" <ComboBoxItem IsEnabled="{Binding IsSDL2Enabled}">
Content="{locale:Locale SettingsTabSystemAudioBackendSDL2}" /> <TextBlock Text="{locale:Locale SettingsTabSystemAudioBackendSDL2}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
<StackPanel Margin="10,0,0,0" Orientation="Horizontal"> <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml
+11 -6
View File
@@ -53,14 +53,19 @@
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
Width="350"> Width="350">
<ComboBoxItem <ComboBoxItem
ToolTip.Tip="{locale:Locale MemoryManagerSoftwareTooltip}" ToolTip.Tip="{locale:Locale MemoryManagerSoftwareTooltip}">
Content="{locale:Locale SettingsTabSystemMemoryManagerModeSoftware}" /> <TextBlock
Text="{locale:Locale SettingsTabSystemMemoryManagerModeSoftware}" />
</ComboBoxItem>
<ComboBoxItem <ComboBoxItem
ToolTip.Tip="{locale:Locale MemoryManagerHostTooltip}" ToolTip.Tip="{locale:Locale MemoryManagerHostTooltip}">
Content="{locale:Locale SettingsTabSystemMemoryManagerModeHost}" /> <TextBlock Text="{locale:Locale SettingsTabSystemMemoryManagerModeHost}" />
</ComboBoxItem>
<ComboBoxItem <ComboBoxItem
ToolTip.Tip="{locale:Locale MemoryManagerUnsafeTooltip}" ToolTip.Tip="{locale:Locale MemoryManagerUnsafeTooltip}">
Content="{locale:Locale SettingsTabSystemMemoryManagerModeHostUnchecked}" /> <TextBlock
Text="{locale:Locale SettingsTabSystemMemoryManagerModeHostUnchecked}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
<CheckBox IsChecked="{Binding UseHypervisor}" <CheckBox IsChecked="{Binding UseHypervisor}"
src/Ryujinx/UI/Views/Settings/SettingsGraphicsView.axaml
+95 -64
View File
@@ -37,12 +37,12 @@
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
ToolTip.Tip="{locale:Locale SettingsTabGraphicsBackendTooltip}" ToolTip.Tip="{locale:Locale SettingsTabGraphicsBackendTooltip}"
SelectedIndex="{Binding GraphicsBackendIndex}"> SelectedIndex="{Binding GraphicsBackendIndex}">
<ComboBoxItem <ComboBoxItem IsVisible="{Binding IsVulkanAvailable}">
IsVisible="{Binding IsVulkanAvailable}" <TextBlock Text="Vulkan" />
Content="Vulkan" /> </ComboBoxItem>
<ComboBoxItem <ComboBoxItem IsEnabled="{Binding IsOpenGLAvailable}">
IsEnabled="{Binding IsOpenGLAvailable}" <TextBlock Text="OpenGL" />
Content="OpenGL" /> </ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal" IsVisible="{Binding IsVulkanSelected}"> <StackPanel Orientation="Horizontal" IsVisible="{Binding IsVulkanSelected}">
@@ -88,16 +88,21 @@
Width="350" Width="350"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
ToolTip.Tip="{locale:Locale ResolutionScaleTooltip}"> ToolTip.Tip="{locale:Locale ResolutionScaleTooltip}">
<ComboBoxItem <ComboBoxItem>
Content="{locale:Locale SettingsTabGraphicsResolutionScaleNative}" /> <TextBlock Text="{locale:Locale SettingsTabGraphicsResolutionScaleNative}" />
<ComboBoxItem </ComboBoxItem>
Content="{locale:Locale SettingsTabGraphicsResolutionScale2x}" /> <ComboBoxItem>
<ComboBoxItem <TextBlock Text="{locale:Locale SettingsTabGraphicsResolutionScale2x}" />
Content="{locale:Locale SettingsTabGraphicsResolutionScale3x}" /> </ComboBoxItem>
<ComboBoxItem <ComboBoxItem>
Content="{locale:Locale SettingsTabGraphicsResolutionScale4x}" /> <TextBlock Text="{locale:Locale SettingsTabGraphicsResolutionScale3x}" />
<ComboBoxItem </ComboBoxItem>
Content="{locale:Locale SettingsTabGraphicsResolutionScaleCustom}" /> <ComboBoxItem>
<TextBlock Text="{locale:Locale SettingsTabGraphicsResolutionScale4x}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{locale:Locale SettingsTabGraphicsResolutionScaleCustom}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
<ui:NumberBox <ui:NumberBox
Margin="10,0,0,0" Margin="10,0,0,0"
@@ -125,18 +130,24 @@
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
ToolTip.Tip="{locale:Locale GraphicsAATooltip}" ToolTip.Tip="{locale:Locale GraphicsAATooltip}"
SelectedIndex="{Binding AntiAliasingEffect}"> SelectedIndex="{Binding AntiAliasingEffect}">
<ComboBoxItem <ComboBoxItem>
Content="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelNone}" /> <TextBlock Text="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelNone}" />
<ComboBoxItem </ComboBoxItem>
Content="FXAA" /> <ComboBoxItem>
<ComboBoxItem <TextBlock Text="FXAA" />
Content="{locale:Locale SmaaLow}" /> </ComboBoxItem>
<ComboBoxItem <ComboBoxItem>
Content="{locale:Locale SmaaMedium}" /> <TextBlock Text="{locale:Locale SmaaLow}" />
<ComboBoxItem </ComboBoxItem>
Content="{locale:Locale SmaaHigh}" /> <ComboBoxItem>
<ComboBoxItem <TextBlock Text="{locale:Locale SmaaMedium}" />
Content="{locale:Locale SmaaUltra}" /> </ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{locale:Locale SmaaHigh}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{locale:Locale SmaaUltra}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
@@ -153,14 +164,18 @@
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
ToolTip.Tip="{locale:Locale GraphicsScalingFilterTooltip}" ToolTip.Tip="{locale:Locale GraphicsScalingFilterTooltip}"
SelectedIndex="{Binding ScalingFilter}"> SelectedIndex="{Binding ScalingFilter}">
<ComboBoxItem <ComboBoxItem>
Content="{locale:Locale GraphicsScalingFilterBilinear}" /> <TextBlock Text="{locale:Locale GraphicsScalingFilterBilinear}" />
<ComboBoxItem </ComboBoxItem>
Content="{locale:Locale GraphicsScalingFilterNearest}" /> <ComboBoxItem>
<ComboBoxItem <TextBlock Text="{locale:Locale GraphicsScalingFilterNearest}" />
Content="{locale:Locale GraphicsScalingFilterFsr}" /> </ComboBoxItem>
<ComboBoxItem <ComboBoxItem>
Content="{locale:Locale GraphicsScalingFilterArea}" /> <TextBlock Text="{locale:Locale GraphicsScalingFilterFsr}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{locale:Locale GraphicsScalingFilterArea}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
<controls:SliderScroll Value="{Binding ScalingFilterLevel}" <controls:SliderScroll Value="{Binding ScalingFilterLevel}"
ToolTip.Tip="{locale:Locale GraphicsScalingFilterLevelTooltip}" ToolTip.Tip="{locale:Locale GraphicsScalingFilterLevelTooltip}"
@@ -191,16 +206,23 @@
Width="350" Width="350"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
ToolTip.Tip="{locale:Locale AnisotropyTooltip}"> ToolTip.Tip="{locale:Locale AnisotropyTooltip}">
<ComboBoxItem <ComboBoxItem>
Content="{locale:Locale SettingsTabGraphicsAnisotropicFilteringAuto}" /> <TextBlock
<ComboBoxItem Text="{locale:Locale SettingsTabGraphicsAnisotropicFilteringAuto}" />
Content="{locale:Locale SettingsTabGraphicsAnisotropicFiltering2x}" /> </ComboBoxItem>
<ComboBoxItem <ComboBoxItem>
Content="{locale:Locale SettingsTabGraphicsAnisotropicFiltering4x}" /> <TextBlock Text="{locale:Locale SettingsTabGraphicsAnisotropicFiltering2x}" />
<ComboBoxItem </ComboBoxItem>
Content="{locale:Locale SettingsTabGraphicsAnisotropicFiltering8x}" /> <ComboBoxItem>
<ComboBoxItem <TextBlock Text="{locale:Locale SettingsTabGraphicsAnisotropicFiltering4x}" />
Content="{locale:Locale SettingsTabGraphicsAnisotropicFiltering16x}" /> </ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{locale:Locale SettingsTabGraphicsAnisotropicFiltering8x}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock
Text="{locale:Locale SettingsTabGraphicsAnisotropicFiltering16x}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
@@ -212,18 +234,24 @@
Width="350" Width="350"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
ToolTip.Tip="{locale:Locale AspectRatioTooltip}"> ToolTip.Tip="{locale:Locale AspectRatioTooltip}">
<ComboBoxItem <ComboBoxItem>
Content="{locale:Locale SettingsTabGraphicsAspectRatio4x3}" /> <TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatio4x3}" />
<ComboBoxItem </ComboBoxItem>
Content="{locale:Locale SettingsTabGraphicsAspectRatio16x9}" /> <ComboBoxItem>
<ComboBoxItem <TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatio16x9}" />
Content="{locale:Locale SettingsTabGraphicsAspectRatio16x10}" /> </ComboBoxItem>
<ComboBoxItem <ComboBoxItem>
Content="{locale:Locale SettingsTabGraphicsAspectRatio21x9}" /> <TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatio16x10}" />
<ComboBoxItem </ComboBoxItem>
Content="{locale:Locale SettingsTabGraphicsAspectRatio32x9}" /> <ComboBoxItem>
<ComboBoxItem <TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatio21x9}" />
Content="{locale:Locale SettingsTabGraphicsAspectRatioStretch}" /> </ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatio32x9}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatioStretch}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
@@ -241,12 +269,15 @@
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
ToolTip.Tip="{locale:Locale GalThreadingTooltip}" ToolTip.Tip="{locale:Locale GalThreadingTooltip}"
SelectedIndex="{Binding GraphicsBackendMultithreadingIndex}"> SelectedIndex="{Binding GraphicsBackendMultithreadingIndex}">
<ComboBoxItem <ComboBoxItem>
Content="{locale:Locale CommonAuto}" /> <TextBlock Text="{locale:Locale CommonAuto}" />
<ComboBoxItem </ComboBoxItem>
Content="{locale:Locale CommonOff}" /> <ComboBoxItem>
<ComboBoxItem <TextBlock Text="{locale:Locale CommonOff}" />
Content="{locale:Locale CommonOn}" /> </ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{locale:Locale CommonOn}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
src/Ryujinx/UI/Views/Settings/SettingsLoggingView.axaml
+13 -8
View File
@@ -97,14 +97,19 @@
Width="150" Width="150"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
ToolTip.Tip="{locale:Locale OpenGlLogLevel}"> ToolTip.Tip="{locale:Locale OpenGlLogLevel}">
<ComboBoxItem <ComboBoxItem>
Content="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelNone}" /> <TextBlock Text="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelNone}" />
<ComboBoxItem </ComboBoxItem>
Content="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelError}" /> <ComboBoxItem>
<ComboBoxItem <TextBlock Text="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelError}" />
Content="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelPerformance}" /> </ComboBoxItem>
<ComboBoxItem <ComboBoxItem>
Content="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelAll}" /> <TextBlock
Text="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelPerformance}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelAll}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
src/Ryujinx/UI/Views/Settings/SettingsNetworkView.axaml
+9 -6
View File
@@ -33,12 +33,15 @@
ToolTip.Tip="{locale:Locale MultiplayerModeTooltip}" ToolTip.Tip="{locale:Locale MultiplayerModeTooltip}"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
Width="250"> Width="250">
<ComboBoxItem <ComboBoxItem>
Content="{locale:Locale MultiplayerModeDisabled}" /> <TextBlock Text="{locale:Locale MultiplayerModeDisabled}" />
<ComboBoxItem </ComboBoxItem>
Content="{locale:Locale MultiplayerModeLdnRyu}" /> <ComboBoxItem>
<ComboBoxItem <TextBlock Text="{locale:Locale MultiplayerModeLdnRyu}" />
Content="{locale:Locale MultiplayerModeLdnMitm}" /> </ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{locale: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="{locale:Locale MultiplayerDisableP2P}" <TextBlock Text="{locale:Locale MultiplayerDisableP2P}"
src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
+105 -70
View File
@@ -45,20 +45,27 @@
ToolTip.Tip="{locale:Locale RegionTooltip}" ToolTip.Tip="{locale:Locale RegionTooltip}"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
Width="350"> Width="350">
<ComboBoxItem <ComboBoxItem>
Content="{locale:Locale SettingsTabSystemSystemRegionJapan}" /> <TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionJapan}" />
<ComboBoxItem </ComboBoxItem>
Content="{locale:Locale SettingsTabSystemSystemRegionUSA}" /> <ComboBoxItem>
<ComboBoxItem <TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionUSA}" />
Content="{locale:Locale SettingsTabSystemSystemRegionEurope}" /> </ComboBoxItem>
<ComboBoxItem <ComboBoxItem>
Content="{locale:Locale SettingsTabSystemSystemRegionAustralia}" /> <TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionEurope}" />
<ComboBoxItem </ComboBoxItem>
Content="{locale:Locale SettingsTabSystemSystemRegionChina}" /> <ComboBoxItem>
<ComboBoxItem <TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionAustralia}" />
Content="{locale:Locale SettingsTabSystemSystemRegionKorea}" /> </ComboBoxItem>
<ComboBoxItem <ComboBoxItem>
Content="{locale:Locale SettingsTabSystemSystemRegionTaiwan}" /> <TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionChina}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionKorea}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionTaiwan}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
<StackPanel <StackPanel
@@ -74,42 +81,60 @@
ToolTip.Tip="{locale:Locale LanguageTooltip}" ToolTip.Tip="{locale:Locale LanguageTooltip}"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
Width="350"> Width="350">
<ComboBoxItem <ComboBoxItem>
Content="{locale:Locale SettingsTabSystemSystemLanguageJapanese}" /> <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageJapanese}" />
<ComboBoxItem </ComboBoxItem>
Content="{locale:Locale SettingsTabSystemSystemLanguageAmericanEnglish}" /> <ComboBoxItem>
<ComboBoxItem <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageAmericanEnglish}" />
Content="{locale:Locale SettingsTabSystemSystemLanguageFrench}" /> </ComboBoxItem>
<ComboBoxItem <ComboBoxItem>
Content="{locale:Locale SettingsTabSystemSystemLanguageGerman}" /> <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageFrench}" />
<ComboBoxItem </ComboBoxItem>
Content="{locale:Locale SettingsTabSystemSystemLanguageItalian}" /> <ComboBoxItem>
<ComboBoxItem <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageGerman}" />
Content="{locale:Locale SettingsTabSystemSystemLanguageSpanish}" /> </ComboBoxItem>
<ComboBoxItem <ComboBoxItem>
Content="{locale:Locale SettingsTabSystemSystemLanguageChinese}" /> <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageItalian}" />
<ComboBoxItem </ComboBoxItem>
Content="{locale:Locale SettingsTabSystemSystemLanguageKorean}" /> <ComboBoxItem>
<ComboBoxItem <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageSpanish}" />
Content="{locale:Locale SettingsTabSystemSystemLanguageDutch}" /> </ComboBoxItem>
<ComboBoxItem <ComboBoxItem>
Content="{locale:Locale SettingsTabSystemSystemLanguagePortuguese}" /> <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageChinese}" />
<ComboBoxItem </ComboBoxItem>
Content="{locale:Locale SettingsTabSystemSystemLanguageRussian}" /> <ComboBoxItem>
<ComboBoxItem <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageKorean}" />
Content="{locale:Locale SettingsTabSystemSystemLanguageTaiwanese}" /> </ComboBoxItem>
<ComboBoxItem <ComboBoxItem>
Content="{locale:Locale SettingsTabSystemSystemLanguageBritishEnglish}" /> <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageDutch}" />
<ComboBoxItem </ComboBoxItem>
Content="{locale:Locale SettingsTabSystemSystemLanguageCanadianFrench}" /> <ComboBoxItem>
<ComboBoxItem <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguagePortuguese}" />
Content="{locale:Locale SettingsTabSystemSystemLanguageLatinAmericanSpanish}" /> </ComboBoxItem>
<ComboBoxItem <ComboBoxItem>
Content="{locale:Locale SettingsTabSystemSystemLanguageSimplifiedChinese}" /> <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageRussian}" />
<ComboBoxItem </ComboBoxItem>
Content="{locale:Locale SettingsTabSystemSystemLanguageTraditionalChinese}" /> <ComboBoxItem>
<ComboBoxItem <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageTaiwanese}" />
Content="{locale:Locale SettingsTabSystemSystemLanguageBrazilianPortuguese}" /> </ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageBritishEnglish}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageCanadianFrench}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageLatinAmericanSpanish}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageSimplifiedChinese}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageTraditionalChinese}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageBrazilianPortuguese}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
<StackPanel <StackPanel
@@ -169,12 +194,15 @@
ToolTip.Tip="{locale:Locale SettingsTabSystemVSyncModeTooltipCustom}" ToolTip.Tip="{locale:Locale SettingsTabSystemVSyncModeTooltipCustom}"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
Width="350"> Width="350">
<ComboBoxItem <ComboBoxItem>
Content="{locale:Locale SettingsTabSystemVSyncModeSwitch}" /> <TextBlock Text="{locale:Locale SettingsTabSystemVSyncModeSwitch}" />
<ComboBoxItem </ComboBoxItem>
Content="{locale:Locale SettingsTabSystemVSyncModeUnbounded}" /> <ComboBoxItem>
<ComboBoxItem <TextBlock Text="{locale:Locale SettingsTabSystemVSyncModeUnbounded}" />
Content="{locale:Locale SettingsTabSystemVSyncModeCustom}" /> </ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{locale:Locale SettingsTabSystemVSyncModeCustom}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
<ComboBox <ComboBox
IsVisible="{Binding !EnableCustomVSyncInterval}" IsVisible="{Binding !EnableCustomVSyncInterval}"
@@ -182,10 +210,12 @@
ToolTip.Tip="{locale:Locale SettingsTabSystemVSyncModeTooltip}" ToolTip.Tip="{locale:Locale SettingsTabSystemVSyncModeTooltip}"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
Width="350"> Width="350">
<ComboBoxItem <ComboBoxItem>
Content="{locale:Locale SettingsTabSystemVSyncModeSwitch}" /> <TextBlock Text="{locale:Locale SettingsTabSystemVSyncModeSwitch}" />
<ComboBoxItem </ComboBoxItem>
Content="{locale:Locale SettingsTabSystemVSyncModeUnbounded}" /> <ComboBoxItem>
<TextBlock Text="{locale:Locale SettingsTabSystemVSyncModeUnbounded}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
<StackPanel IsVisible="{Binding EnableCustomVSyncInterval}" <StackPanel IsVisible="{Binding EnableCustomVSyncInterval}"
@@ -242,16 +272,21 @@
ToolTip.Tip="{locale:Locale DRamTooltip}" ToolTip.Tip="{locale:Locale DRamTooltip}"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
Width="350"> Width="350">
<ComboBoxItem <ComboBoxItem>
Content="{locale:Locale SettingsTabSystemDramSize4GiB}" /> <TextBlock Text="{locale:Locale SettingsTabSystemDramSize4GiB}" />
<ComboBoxItem </ComboBoxItem>
Content="{locale:Locale SettingsTabSystemDramSize6GiB}" /> <ComboBoxItem>
<ComboBoxItem <TextBlock Text="{locale:Locale SettingsTabSystemDramSize6GiB}" />
Content="{locale:Locale SettingsTabSystemDramSize8GiB}" /> </ComboBoxItem>
<ComboBoxItem <ComboBoxItem>
Content="{locale:Locale SettingsTabSystemDramSize10GiB}" /> <TextBlock Text="{locale:Locale SettingsTabSystemDramSize8GiB}" />
<ComboBoxItem </ComboBoxItem>
Content="{locale:Locale SettingsTabSystemDramSize12GiB}" /> <ComboBoxItem>
<TextBlock Text="{locale:Locale SettingsTabSystemDramSize10GiB}" />
</ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{locale:Locale SettingsTabSystemDramSize12GiB}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
<StackPanel <StackPanel
src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
+18 -12
View File
@@ -46,12 +46,15 @@
<ComboBox SelectedIndex="{Binding HideCursor}" <ComboBox SelectedIndex="{Binding HideCursor}"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
MinWidth="100"> MinWidth="100">
<ComboBoxItem <ComboBoxItem>
Content="{locale:Locale SettingsTabGeneralHideCursorNever}" /> <TextBlock Text="{locale:Locale SettingsTabGeneralHideCursorNever}" />
<ComboBoxItem </ComboBoxItem>
Content="{locale:Locale SettingsTabGeneralHideCursorOnIdle}" /> <ComboBoxItem>
<ComboBoxItem <TextBlock Text="{locale:Locale SettingsTabGeneralHideCursorOnIdle}" />
Content="{locale:Locale SettingsTabGeneralHideCursorAlways}" /> </ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{locale:Locale SettingsTabGeneralHideCursorAlways}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
<StackPanel Margin="0, 15, 0, 10" Orientation="Horizontal"> <StackPanel Margin="0, 15, 0, 10" Orientation="Horizontal">
@@ -62,12 +65,15 @@
<ComboBox SelectedIndex="{Binding BaseStyleIndex}" <ComboBox SelectedIndex="{Binding BaseStyleIndex}"
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
MinWidth="100"> MinWidth="100">
<ComboBoxItem <ComboBoxItem>
Content="{locale:Locale SettingsTabGeneralThemeAuto}" /> <TextBlock Text="{locale:Locale SettingsTabGeneralThemeAuto}" />
<ComboBoxItem </ComboBoxItem>
Content="{locale:Locale SettingsTabGeneralThemeLight}" /> <ComboBoxItem>
<ComboBoxItem <TextBlock Text="{locale:Locale SettingsTabGeneralThemeLight}" />
Content="{locale:Locale SettingsTabGeneralThemeDark}" /> </ComboBoxItem>
<ComboBoxItem>
<TextBlock Text="{locale:Locale SettingsTabGeneralThemeDark}" />
</ComboBoxItem>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
src/Ryujinx/UI/Views/User/UserEditorView.axaml
+8 -12
View File
@@ -98,24 +98,20 @@
Spacing="10"> Spacing="10">
<Button <Button
Name="DeleteButton" Name="DeleteButton"
Click="DeleteButton_Click"> Click="DeleteButton_Click"
<TextBlock Text="{locale:Locale UserProfilesDelete}" /> Content="{locale:Locale UserProfilesDelete}" />
</Button>
<Button <Button
Name="ChangePictureButton" Name="ChangePictureButton"
Click="ChangePictureButton_Click"> Click="ChangePictureButton_Click"
<TextBlock Text="{locale:Locale UserProfilesChangeProfileImage}" /> Content="{locale:Locale UserProfilesChangeProfileImage}" />
</Button>
<Button <Button
Name="AddPictureButton" Name="AddPictureButton"
Click="ChangePictureButton_Click"> Click="ChangePictureButton_Click"
<TextBlock Text="{locale:Locale UserProfilesSetProfileImage}" /> Content="{locale:Locale UserProfilesSetProfileImage}" />
</Button>
<Button <Button
Name="SaveButton" Name="SaveButton"
Click="SaveButton_Click"> Click="SaveButton_Click"
<TextBlock Text="{locale:Locale UserProfilesSetProfileImage}" /> Content="{locale:Locale Save}" />
</Button>
</StackPanel> </StackPanel>
</Grid> </Grid>
</UserControl> </UserControl>
src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml
+8 -12
View File
@@ -38,16 +38,14 @@
<ComboBoxItem> <ComboBoxItem>
<Label <Label
VerticalAlignment="Center" VerticalAlignment="Center"
HorizontalContentAlignment="Left"> HorizontalContentAlignment="Left"
<TextBlock Text="{locale:Locale Name}" /> Content="{locale:Locale Name}" />
</Label>
</ComboBoxItem> </ComboBoxItem>
<ComboBoxItem> <ComboBoxItem>
<Label <Label
VerticalAlignment="Center" VerticalAlignment="Center"
HorizontalContentAlignment="Left"> HorizontalContentAlignment="Left"
<TextBlock Text="{locale:Locale Size}" /> Content="{locale:Locale Size}" />
</Label>
</ComboBoxItem> </ComboBoxItem>
<ComboBox.Styles> <ComboBox.Styles>
<Style Selector="ContentControl#ContentPresenter"> <Style Selector="ContentControl#ContentPresenter">
@@ -59,16 +57,14 @@
<ComboBoxItem> <ComboBoxItem>
<Label <Label
VerticalAlignment="Center" VerticalAlignment="Center"
HorizontalContentAlignment="Left"> HorizontalContentAlignment="Left"
<TextBlock Text="{locale:Locale OrderAscending}" /> Content="{locale:Locale OrderAscending}" />
</Label>
</ComboBoxItem> </ComboBoxItem>
<ComboBoxItem> <ComboBoxItem>
<Label <Label
VerticalAlignment="Center" VerticalAlignment="Center"
HorizontalContentAlignment="Left"> HorizontalContentAlignment="Left"
<TextBlock Text="{locale:Locale OrderDescending}" /> Content="{locale:Locale OrderDescending}" />
</Label>
</ComboBoxItem> </ComboBoxItem>
<ComboBox.Styles> <ComboBox.Styles>
<Style Selector="ContentControl#ContentPresenter"> <Style Selector="ContentControl#ContentPresenter">
src/Ryujinx/UI/Views/User/UserSelectorView.axaml
+6 -9
View File
@@ -142,13 +142,11 @@
Orientation="Horizontal" Orientation="Horizontal"
Spacing="10"> Spacing="10">
<Button <Button
Click="ManageSaves"> Click="ManageSaves"
<TextBlock Text="{locale:Locale UserProfilesManageSaves}" /> Content="{locale:Locale UserProfilesManageSaves}" />
</Button>
<Button <Button
Click="RecoverLostAccounts"> Click="RecoverLostAccounts"
<TextBlock Text="{locale:Locale UserProfilesRecoverLostAccounts}" /> Content="{locale:Locale UserProfilesRecoverLostAccounts}" />
</Button>
</StackPanel> </StackPanel>
<StackPanel <StackPanel
Grid.Row="1" Grid.Row="1"
@@ -156,9 +154,8 @@
HorizontalAlignment="Right" HorizontalAlignment="Right"
Orientation="Horizontal"> Orientation="Horizontal">
<Button <Button
Click="Close"> Click="Close"
<TextBlock Text="{locale:Locale UserProfilesClose}" /> Content="{locale:Locale UserProfilesClose}" />
</Button>
</StackPanel> </StackPanel>
</Grid> </Grid>
</UserControl> </UserControl>