diff options
Diffstat (limited to 'Ryujinx.Ava/UI')
| -rw-r--r-- | Ryujinx.Ava/UI/Views/Settings/SettingsLoggingView.axaml | 21 | ||||
| -rw-r--r-- | Ryujinx.Ava/UI/Views/Settings/SettingsSystemView.axaml | 8 | ||||
| -rw-r--r-- | Ryujinx.Ava/UI/Windows/SettingsWindow.axaml | 54 |
3 files changed, 47 insertions, 36 deletions
diff --git a/Ryujinx.Ava/UI/Views/Settings/SettingsLoggingView.axaml b/Ryujinx.Ava/UI/Views/Settings/SettingsLoggingView.axaml index 2163dcda..948e7181 100644 --- a/Ryujinx.Ava/UI/Views/Settings/SettingsLoggingView.axaml +++ b/Ryujinx.Ava/UI/Views/Settings/SettingsLoggingView.axaml @@ -1,4 +1,4 @@ -<UserControl +<UserControl x:Class="Ryujinx.Ava.UI.Views.Settings.SettingsLoggingView" xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" @@ -47,31 +47,34 @@ ToolTip.Tip="{locale:Locale ErrorLogTooltip}"> <TextBlock Text="{locale:Locale SettingsTabLoggingEnableErrorLogs}" /> </CheckBox> - <CheckBox IsChecked="{Binding EnableTrace}" - ToolTip.Tip="{locale:Locale TraceLogTooltip}"> - <TextBlock Text="{locale:Locale SettingsTabLoggingEnableTraceLogs}" /> - </CheckBox> <CheckBox IsChecked="{Binding EnableGuest}" ToolTip.Tip="{locale:Locale GuestLogTooltip}"> <TextBlock Text="{locale:Locale SettingsTabLoggingEnableGuestLogs}" /> </CheckBox> </StackPanel> <Separator Height="1" /> - <TextBlock Classes="h1" Text="{locale:Locale SettingsTabLoggingDeveloperOptions}" /> + <StackPanel Orientation="Vertical" Spacing="2"> + <TextBlock Classes="h1" Text="{locale:Locale SettingsTabLoggingDeveloperOptions}" /> + <TextBlock Foreground="{DynamicResource SecondaryTextColor}" Text="{locale:Locale SettingsTabLoggingDeveloperOptionsNote}" /> + </StackPanel> <StackPanel Margin="10,0,0,0" HorizontalAlignment="Stretch" Orientation="Vertical" Spacing="10"> <StackPanel Orientation="Vertical"> - <CheckBox IsChecked="{Binding EnableDebug}" - ToolTip.Tip="{locale:Locale DebugLogTooltip}"> - <TextBlock Text="{locale:Locale SettingsTabLoggingEnableDebugLogs}" /> + <CheckBox IsChecked="{Binding EnableTrace}" + ToolTip.Tip="{locale:Locale TraceLogTooltip}"> + <TextBlock Text="{locale:Locale SettingsTabLoggingEnableTraceLogs}" /> </CheckBox> <CheckBox IsChecked="{Binding EnableFsAccessLog}" ToolTip.Tip="{locale:Locale FileAccessLogTooltip}"> <TextBlock Text="{locale:Locale SettingsTabLoggingEnableFsAccessLogs}" /> </CheckBox> + <CheckBox IsChecked="{Binding EnableDebug}" + ToolTip.Tip="{locale:Locale DebugLogTooltip}"> + <TextBlock Text="{locale:Locale SettingsTabLoggingEnableDebugLogs}" /> + </CheckBox> <StackPanel Margin="0,10,0,0" Orientation="Horizontal" VerticalAlignment="Stretch"> <TextBlock VerticalAlignment="Center" ToolTip.Tip="{locale:Locale FSAccessLogModeTooltip}" diff --git a/Ryujinx.Ava/UI/Views/Settings/SettingsSystemView.axaml b/Ryujinx.Ava/UI/Views/Settings/SettingsSystemView.axaml index ddcca39c..1d4f040f 100644 --- a/Ryujinx.Ava/UI/Views/Settings/SettingsSystemView.axaml +++ b/Ryujinx.Ava/UI/Views/Settings/SettingsSystemView.axaml @@ -1,4 +1,4 @@ -<UserControl +<UserControl x:Class="Ryujinx.Ava.UI.Views.Settings.SettingsSystemView" xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" @@ -12,7 +12,7 @@ <Design.DataContext> <viewModels:SettingsViewModel /> </Design.DataContext> - <ScrollViewer + <ScrollViewer Name="SystemPage" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" @@ -172,9 +172,9 @@ </CheckBox> </StackPanel> <Separator Height="1" /> - <StackPanel Orientation="Horizontal"> + <StackPanel Orientation="Vertical" Spacing="2"> <TextBlock Classes="h1" Text="{locale:Locale SettingsTabSystemHacks}" /> - <TextBlock Text="{locale:Locale SettingsTabSystemHacksNote}" /> + <TextBlock Foreground="{DynamicResource SecondaryTextColor}" Text="{locale:Locale SettingsTabSystemHacksNote}" /> </StackPanel> <StackPanel Margin="10,0,0,0" diff --git a/Ryujinx.Ava/UI/Windows/SettingsWindow.axaml b/Ryujinx.Ava/UI/Windows/SettingsWindow.axaml index 851e9b5b..a44cbfe7 100644 --- a/Ryujinx.Ava/UI/Windows/SettingsWindow.axaml +++ b/Ryujinx.Ava/UI/Windows/SettingsWindow.axaml @@ -44,20 +44,22 @@ <settings:SettingsNetworkView Name="NetworkPage" /> <settings:SettingsLoggingView Name="LoggingPage" /> </Grid> - <ui:NavigationView Grid.Row="1" - IsSettingsVisible="False" - Name="NavPanel" - IsBackEnabled="False" - PaneDisplayMode="Left" - Margin="2,10,10,0" - VerticalAlignment="Stretch" - HorizontalAlignment="Stretch" - OpenPaneLength="200"> + <ui:NavigationView + Grid.Row="1" + IsSettingsVisible="False" + Name="NavPanel" + IsBackEnabled="False" + PaneDisplayMode="Left" + Margin="2,10,10,0" + VerticalAlignment="Stretch" + HorizontalAlignment="Stretch" + OpenPaneLength="200"> <ui:NavigationView.MenuItems> - <ui:NavigationViewItem IsSelected="True" - Content="{locale:Locale SettingsTabGeneral}" - Tag="UiPage" - Icon="New" /> + <ui:NavigationViewItem + IsSelected="True" + Content="{locale:Locale SettingsTabGeneral}" + Tag="UiPage" + Icon="New" /> <ui:NavigationViewItem Content="{locale:Locale SettingsTabInput}" Tag="InputPage" @@ -74,8 +76,9 @@ Content="{locale:Locale SettingsTabCpu}" Tag="CpuPage"> <ui:NavigationViewItem.Icon> - <ui:FontIcon FontFamily="avares://Ryujinx.Ava/Assets/Fonts#Segoe Fluent Icons" - Glyph="{helpers:GlyphValueConverter Chip}" /> + <ui:FontIcon + FontFamily="avares://Ryujinx.Ava/Assets/Fonts#Segoe Fluent Icons" + Glyph="{helpers:GlyphValueConverter Chip}" /> </ui:NavigationViewItem.Icon> </ui:NavigationViewItem> <ui:NavigationViewItem @@ -95,6 +98,11 @@ Tag="LoggingPage" Icon="Document" /> </ui:NavigationView.MenuItems> + <ui:NavigationView.Styles> + <Style Selector="Grid#PlaceholderGrid"> + <Setter Property="Height" Value="40" /> + </Style> + </ui:NavigationView.Styles> </ui:NavigationView> <ReversibleStackPanel Grid.Row="2" @@ -103,17 +111,17 @@ Orientation="Horizontal" HorizontalAlignment="Right" ReverseOrder="{Binding IsMacOS}"> - <Button - HotKey="Enter" + <Button + HotKey="Enter" Classes="accent" - Content="{locale:Locale SettingsButtonOk}" + Content="{locale:Locale SettingsButtonOk}" Command="{ReflectionBinding OkButton}" /> - <Button - HotKey="Escape" - Content="{locale:Locale SettingsButtonCancel}" + <Button + HotKey="Escape" + Content="{locale:Locale SettingsButtonCancel}" Command="{ReflectionBinding CancelButton}" /> - <Button - Content="{locale:Locale SettingsButtonApply}" + <Button + Content="{locale:Locale SettingsButtonApply}" Command="{ReflectionBinding ApplyButton}" /> </ReversibleStackPanel> </Grid> |