liberodark/ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UI: Settings → Interface Tab + General Settings (ryubing/ryujinx!154)

Browse source 
See merge request ryubing/ryujinx!154
This commit is contained in:
Neo 2025-10-09 16:32:33 -05:00 • committed by GreemDev
parent db31ff15c7
commit 4f5a236c21
5 changed files with 405 additions and 595 deletions
Download patch file Download diff file Expand all files Collapse all files

930
assets/locales.json
View file

File diff suppressed because it is too large Load diff

2
src/Ryujinx/UI/Helpers/Converters/GlyphValueConverter.cs
View file

@ -14,6 +14,8 @@ namespace Ryujinx.Ava.UI.Helpers
{ Glyph.List, char.ConvertFromUtf32((int)Symbol.List) }, { Glyph.List, char.ConvertFromUtf32((int)Symbol.List) },
{ Glyph.Grid, char.ConvertFromUtf32((int)Symbol.ViewAll) }, { Glyph.Grid, char.ConvertFromUtf32((int)Symbol.ViewAll) },
{ Glyph.Chip, char.ConvertFromUtf32(59748) }, { Glyph.Chip, char.ConvertFromUtf32(59748) },
{ Glyph.Device, char.ConvertFromUtf32(0xE7F7) },
{ Glyph.Bug, char.ConvertFromUtf32(0xEBE8) },
{ Glyph.Important, char.ConvertFromUtf32((int)Symbol.Important) }, { Glyph.Important, char.ConvertFromUtf32((int)Symbol.Important) },
}; };

2
src/Ryujinx/UI/Helpers/Glyph.cs
View file

@ -5,6 +5,8 @@ namespace Ryujinx.Ava.UI.Helpers
List, List,
Grid, Grid,
Chip, Chip,
Device,
Bug,
Important, Important,
} }
} }

36
src/Ryujinx/UI/Views/Settings/SettingsUIView.axaml
View file

@ -27,13 +27,6 @@
Spacing="10"> Spacing="10">
<TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralGeneral}" /> <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGeneralGeneral}" />
<StackPanel Margin="10,0,0,0" Orientation="Vertical"> <StackPanel Margin="10,0,0,0" Orientation="Vertical">
<CheckBox IsChecked="{Binding EnableDiscordIntegration}">
<StackPanel Orientation="Horizontal">
<TextBlock VerticalAlignment="Center"
ToolTip.Tip="{ext:Locale ToggleDiscordTooltip}"
Text="{ext:Locale SettingsTabGeneralEnableDiscordRichPresence}" />
</StackPanel>
</CheckBox>
<CheckBox <CheckBox
IsEnabled="{Binding !IsGameTitleNotNull}" IsEnabled="{Binding !IsGameTitleNotNull}"
Opacity="{Binding PanelOpacity}" Opacity="{Binding PanelOpacity}"
@ -62,6 +55,13 @@
<TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" /> <TextBlock Classes="globalConfigMarker" IsVisible="{Binding IsGameTitleNotNull}" />
</StackPanel> </StackPanel>
</CheckBox> </CheckBox>
<CheckBox IsChecked="{Binding EnableDiscordIntegration}">
<StackPanel Orientation="Horizontal">
<TextBlock VerticalAlignment="Center"
ToolTip.Tip="{ext:Locale ToggleDiscordTooltip}"
Text="{ext:Locale SettingsTabGeneralEnableDiscordRichPresence}" />
</StackPanel>
</CheckBox>
<StackPanel <StackPanel
Margin="0, 15, 0, 0" Margin="0, 15, 0, 0"
Orientation="Horizontal"> Orientation="Horizontal">
@ -101,7 +101,7 @@
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
MinWidth="100"> MinWidth="100">
<ComboBoxItem> <ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabGeneralCheckUpdatesOnLaunchOff}" /> <TextBlock Text="{ext:Locale CommonOff}" />
</ComboBoxItem> </ComboBoxItem>
<ComboBoxItem> <ComboBoxItem>
<TextBlock <TextBlock
@ -123,7 +123,7 @@
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
MinWidth="100"> MinWidth="100">
<ComboBoxItem> <ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabGeneralHideCursorNever}" /> <TextBlock Text="{ext:Locale Never}" />
</ComboBoxItem> </ComboBoxItem>
<ComboBoxItem> <ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabGeneralHideCursorOnIdle}" /> <TextBlock Text="{ext:Locale SettingsTabGeneralHideCursorOnIdle}" />
@ -146,7 +146,7 @@
HorizontalContentAlignment="Left" HorizontalContentAlignment="Left"
MinWidth="100"> MinWidth="100">
<ComboBoxItem> <ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabGeneralThemeAuto}" /> <TextBlock Text="{ext:Locale CommonAuto}" />
</ComboBoxItem> </ComboBoxItem>
<ComboBoxItem> <ComboBoxItem>
<TextBlock Text="{ext:Locale SettingsTabGeneralThemeLight}" /> <TextBlock Text="{ext:Locale SettingsTabGeneralThemeLight}" />
@ -198,14 +198,13 @@
<TextBox <TextBox
Name="GameDirPathBox" Name="GameDirPathBox"
Margin="0" Margin="0"
ToolTip.Tip="{ext:Locale AddGameDirBoxTooltip}" Watermark="{ext:Locale AddGameDirBoxTooltip}"
VerticalAlignment="Stretch" /> VerticalAlignment="Stretch" />
<Button <Button
Name="AddGameDirButton" Name="AddGameDirButton"
Grid.Column="1" Grid.Column="1"
MinWidth="90" MinWidth="90"
Margin="10,0,0,0" Margin="10,0,0,0">
ToolTip.Tip="{ext:Locale AddGameDirTooltip}">
<TextBlock HorizontalAlignment="Center" <TextBlock HorizontalAlignment="Center"
Text="{ext:Locale SettingsTabGeneralAdd}" /> Text="{ext:Locale SettingsTabGeneralAdd}" />
</Button> </Button>
@ -213,8 +212,7 @@
Name="RemoveGameDirButton" Name="RemoveGameDirButton"
Grid.Column="2" Grid.Column="2"
MinWidth="90" MinWidth="90"
Margin="10,0,0,0" Margin="5,0,0,0"
ToolTip.Tip="{ext:Locale RemoveGameDirTooltip}"
Click="RemoveGameDirButton_OnClick"> Click="RemoveGameDirButton_OnClick">
<TextBlock HorizontalAlignment="Center" <TextBlock HorizontalAlignment="Center"
Text="{ext:Locale SettingsTabGeneralRemove}" /> Text="{ext:Locale SettingsTabGeneralRemove}" />
@ -252,14 +250,13 @@
<TextBox <TextBox
Name="AutoloadDirPathBox" Name="AutoloadDirPathBox"
Margin="0" Margin="0"
ToolTip.Tip="{ext:Locale AddAutoloadDirBoxTooltip}" Watermark="{ext:Locale AddGameDirBoxTooltip}"
VerticalAlignment="Stretch" /> VerticalAlignment="Stretch" />
<Button <Button
Name="AddAutoloadDirButton" Name="AddAutoloadDirButton"
Grid.Column="1" Grid.Column="1"
MinWidth="90" MinWidth="90"
Margin="10,0,0,0" Margin="10,0,0,0">
ToolTip.Tip="{ext:Locale AddAutoloadDirTooltip}">
<TextBlock HorizontalAlignment="Center" <TextBlock HorizontalAlignment="Center"
Text="{ext:Locale SettingsTabGeneralAdd}" /> Text="{ext:Locale SettingsTabGeneralAdd}" />
</Button> </Button>
@ -267,8 +264,7 @@
Name="RemoveAutoloadDirButton" Name="RemoveAutoloadDirButton"
Grid.Column="2" Grid.Column="2"
MinWidth="90" MinWidth="90"
Margin="10,0,0,0" Margin="5,0,0,0"
ToolTip.Tip="{ext:Locale RemoveAutoloadDirTooltip}"
Click="RemoveAutoloadDirButton_OnClick"> Click="RemoveAutoloadDirButton_OnClick">
<TextBlock HorizontalAlignment="Center" <TextBlock HorizontalAlignment="Center"
Text="{ext:Locale SettingsTabGeneralRemove}" /> Text="{ext:Locale SettingsTabGeneralRemove}" />

30
src/Ryujinx/UI/Windows/SettingsWindow.axaml
View file

@ -39,11 +39,11 @@
<Grid Name="Pages" IsVisible="False" Grid.Row="3"> <Grid Name="Pages" IsVisible="False" Grid.Row="3">
<settings:SettingsUiView Name="UiPage" /> <settings:SettingsUiView Name="UiPage" />
<settings:SettingsInputView Name="InputPage" /> <settings:SettingsInputView Name="InputPage" />
<settings:SettingsHotkeysView Name="HotkeysPage" />
<settings:SettingsSystemView Name="SystemPage" /> <settings:SettingsSystemView Name="SystemPage" />
<settings:SettingsCPUView Name="CpuPage" /> <settings:SettingsCPUView Name="CpuPage" />
<settings:SettingsGraphicsView Name="GraphicsPage" /> <settings:SettingsGraphicsView Name="GraphicsPage" />
<settings:SettingsAudioView Name="AudioPage" /> <settings:SettingsAudioView Name="AudioPage" />
<settings:SettingsHotkeysView Name="HotkeysPage" />
<settings:SettingsNetworkView Name="NetworkPage" /> <settings:SettingsNetworkView Name="NetworkPage" />
<settings:SettingsLoggingView Name="LoggingPage" /> <settings:SettingsLoggingView Name="LoggingPage" />
<settings:SettingsDebugView Name="DebugPage" /> <settings:SettingsDebugView Name="DebugPage" />
@ -54,7 +54,7 @@
IsSettingsVisible="False" IsSettingsVisible="False"
Name="NavPanel" Name="NavPanel"
IsBackEnabled="False" IsBackEnabled="False"
Margin="10,10,10,0" Margin="10,0,10,0"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
OpenPaneLength="200"> OpenPaneLength="200">
@ -62,16 +62,17 @@
<ui:NavigationViewItem <ui:NavigationViewItem
IsSelected="True" IsSelected="True"
Content="{ext:Locale SettingsTabGeneral}" Content="{ext:Locale SettingsTabGeneral}"
Tag="UiPage" Tag="UiPage">
IconSource="New" /> <ui:NavigationViewItem.IconSource>
<ui:FontIconSource
FontFamily="avares://Ryujinx/Assets/Fonts#Segoe Fluent Icons"
Glyph="{helpers:GlyphValueConverter Device}" />
</ui:NavigationViewItem.IconSource>
</ui:NavigationViewItem>
<ui:NavigationViewItem <ui:NavigationViewItem
Content="{ext:Locale SettingsTabInput}" Content="{ext:Locale SettingsTabInput}"
Tag="InputPage" Tag="InputPage"
IconSource="Games" /> IconSource="Games" />
<ui:NavigationViewItem
Content="{ext:Locale SettingsTabHotkeys}"
Tag="HotkeysPage"
IconSource="Keyboard" />
<ui:NavigationViewItem <ui:NavigationViewItem
Content="{ext:Locale SettingsTabSystem}" Content="{ext:Locale SettingsTabSystem}"
Tag="SystemPage" Tag="SystemPage"
@ -93,6 +94,10 @@
Content="{ext:Locale SettingsTabAudio}" Content="{ext:Locale SettingsTabAudio}"
IconSource="Audio" IconSource="Audio"
Tag="AudioPage" /> Tag="AudioPage" />
<ui:NavigationViewItem
Content="{ext:Locale SettingsTabHotkeys}"
Tag="HotkeysPage"
IconSource="Keyboard" />
<ui:NavigationViewItem <ui:NavigationViewItem
Content="{ext:Locale SettingsTabNetwork}" Content="{ext:Locale SettingsTabNetwork}"
Tag="NetworkPage" Tag="NetworkPage"
@ -103,8 +108,13 @@
IconSource="Document" /> IconSource="Document" />
<ui:NavigationViewItem <ui:NavigationViewItem
Content="{ext:Locale SettingsTabDebug}" Content="{ext:Locale SettingsTabDebug}"
Tag="DebugPage" Tag="DebugPage">
IconSource="Star" /> <ui:NavigationViewItem.IconSource>
<ui:FontIconSource
FontFamily="avares://Ryujinx/Assets/Fonts#Segoe Fluent Icons"
Glyph="{helpers:GlyphValueConverter Bug}" />
</ui:NavigationViewItem.IconSource>
</ui:NavigationViewItem>
<ui:NavigationViewItem <ui:NavigationViewItem
IsVisible="{Binding ShowDirtyHacks}" IsVisible="{Binding ShowDirtyHacks}"
Content="Dirty Hacks" Content="Dirty Hacks"