mirrors/Ryubing
1
0
Fork 0
mirror of https://git.ryujinx.app/ryubing/ryujinx.git synced 2025-08-13 08:46:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI Updates Batch 2 (ryubing/ryujinx!105)

Browse Source 
See merge request ryubing/ryujinx!105
This commit is contained in:
Neo 2025-08-12 17:45:24 -05:00 committed by GreemDev
parent c6f22318a7
commit ae2e9a73ab
8 changed files with 53 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
assets/locales.json
View File

@ -23693,28 +23693,28 @@
}
},
{
"ID": "CompatibilityListInfo",
"ID": "CompatibilityListStats",
"Translations": {
"ar_SA": "",
"de_DE": "",
"el_GR": "Πληροφορίες",
"en_US": "Info",
"es_ES": "Información",
"fr_FR": "",
"he_IL": "מידע",
"el_GR": "",
"en_US": "Stats",
"es_ES": null,
"fr_FR": null,
"he_IL": "",
"it_IT": "",
"ja_JP": "情報",
"ko_KR": "정보",
"ja_JP": "",
"ko_KR": "",
"no_NO": "",
"pl_PL": "Informacja",
"pl_PL": "",
"pt_BR": "",
"ru_RU": "Инфо",
"ru_RU": "Данные",
"sv_SE": "",
"th_TH": "รายละเอียด",
"tr_TR": "Bilgi",
"uk_UA": "Інфо",
"zh_CN": "信息",
"zh_TW": "資訊"
"th_TH": "",
"tr_TR": "",
"uk_UA": "",
"zh_CN": "",
"zh_TW": ""
}
},
{

4
src/Ryujinx/Assets/Styles/Styles.xaml
View File

@ -266,7 +266,7 @@
</Style>
<Style Selector="ToggleButton">
<Setter Property="Padding"
Value="0,-5,0,0" />
Value="0,0,0,0" />
</Style>
<Style Selector="TabItem">
<Setter Property="FontSize"
@ -336,7 +336,7 @@
</Style>
<Style Selector="CheckBox TextBlock">
<Setter Property="Margin"
Value="0,5,0,0" />
Value="0,2,0,0" />
</Style>
<Style Selector="TextBlock.globalConfigMarker" >
<Setter Property="Foreground" Value="SeaGreen"/>

15
src/Ryujinx/Systems/AppHost.cs
View File

@ -482,7 +482,10 @@ namespace Ryujinx.Ava.Systems
Dispatcher.UIThread.InvokeAsync(() =>
{
_viewModel.Title = TitleHelper.ActiveApplicationTitle(Device.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowOldUI);
if (ConfigurationState.Instance.ShowOldUI)
{
_viewModel.Title = TitleHelper.ActiveApplicationTitle(Device.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowOldUI);
}
});
_viewModel.SetUiProgressHandlers(Device);
@ -902,7 +905,10 @@ namespace Ryujinx.Ava.Systems
_viewModel.IsPaused = false;
_playTimer.Start();
_viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowOldUI);
if (ConfigurationState.Instance.ShowOldUI)
{
_viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowOldUI);
}
Logger.Info?.Print(LogClass.Emulation, "Emulation was resumed");
}
@ -912,7 +918,10 @@ namespace Ryujinx.Ava.Systems
_viewModel.IsPaused = true;
_playTimer.Stop();
_viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowOldUI, LocaleManager.Instance[LocaleKeys.Paused]);
if (ConfigurationState.Instance.ShowOldUI)
{
_viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowOldUI, LocaleManager.Instance[LocaleKeys.Paused]);
}
Logger.Info?.Print(LogClass.Emulation, "Emulation was paused");
}

10
src/Ryujinx/UI/Helpers/Converters/PlayabilityStatusConverter.cs
View File

@ -15,11 +15,11 @@ namespace Ryujinx.Ava.UI.Helpers
public object Convert(object value, Type _, object __, CultureInfo ___)
=> value.Cast<LocaleKeys>() switch
{
LocaleKeys.CompatibilityListNothing or
LocaleKeys.CompatibilityListBoots or
LocaleKeys.CompatibilityListMenus => Brushes.Red,
LocaleKeys.CompatibilityListIngame => Brushes.DarkOrange,
_ => Brushes.ForestGreen
LocaleKeys.CompatibilityListNothing => Brushes.DarkGray,
LocaleKeys.CompatibilityListBoots => Brushes.Red,
LocaleKeys.CompatibilityListMenus => Brushes.Tomato,
LocaleKeys.CompatibilityListIngame => Brushes.Orange,
_ => Brushes.LimeGreen
};
public object ConvertBack(object value, Type _, object __, CultureInfo ___)

8
src/Ryujinx/UI/Views/Main/MainViewControls.axaml
View File

@ -47,13 +47,13 @@
Glyph="{helpers:GlyphValueConverter Grid}" />
</Button>
<TextBlock
Margin="10,0"
Margin="10,0,5,0"
VerticalAlignment="Center"
Text="{ext:Locale IconSize}" />
<controls:SliderScroll
Width="150"
Height="35"
Margin="5,-10,5,0"
Margin="5,-12,10,0"
VerticalAlignment="Center"
IsSnapToTickEnabled="True"
SmallChange="1"
@ -62,11 +62,11 @@
TickFrequency="1"
Value="{Binding GridSizeScale}" />
<CheckBox
Margin="0"
Margin="0,-2,0,0"
VerticalAlignment="Center"
IsChecked="{Binding ShowNames, Mode=TwoWay}"
IsVisible="{Binding IsGrid}">
<TextBlock Margin="5,3,0,0" Text="{ext:Locale CommonShowNames}" />
<TextBlock Text="{ext:Locale CommonShowNames}" />
</CheckBox>
<TextBox
Name="SearchBox"

5
src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml
View File

@ -117,8 +117,9 @@
<ToggleButton Name="TurboMode">
<TextBlock Text="{Binding KeyboardHotkey.TurboMode, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
</ToggleButton>
<TextBlock Text="{ext:Locale SettingsTabHotkeysOnlyWhilePressed}" Margin="10,0" />
<CheckBox IsChecked="{Binding KeyboardHotkey.TurboModeWhileHeld}" />
<CheckBox IsChecked="{Binding KeyboardHotkey.TurboModeWhileHeld}" Margin="10,0,0,0">
<TextBlock Text="{ext:Locale SettingsTabHotkeysOnlyWhilePressed}" />
</CheckBox>
</StackPanel>
</StackPanel>
</Border>

20
src/Ryujinx/UI/Windows/CompatibilityListWindow.axaml
View File

@ -88,14 +88,15 @@
</DropDownButton.Flyout>
</DropDownButton>
</StackPanel>
<CheckBox Grid.Column="3" Margin="7, 0, 0, 0" IsChecked="{Binding OnlyShowOwnedGames}" />
<TextBlock Grid.Column="4" Padding="0, 0, 138, 0" Margin="-10, 0, 18, 0" Text="{ext:Locale CompatibilityListOnlyShowOwnedGames}" />
<CheckBox Grid.Column="3" Margin="20, 0, 50, 0" IsChecked="{Binding OnlyShowOwnedGames}">
<TextBlock Text="{ext:Locale CompatibilityListOnlyShowOwnedGames}" />
</CheckBox>
</Grid>
<!-- UI NormalControls -->
<Grid Grid.Row="0" ColumnDefinitions="*,Auto,Auto,Auto" Name="NormalControls">
<TextBox Name="SearchBoxNormal" Grid.Column="0" Margin="15, 0, 0, 5" HorizontalAlignment="Stretch" Watermark="{ext:Locale CompatibilityListSearchBoxWatermarkWithCount}" TextChanged="TextBox_OnTextChanged" />
<StackPanel Grid.Column="1" Orientation="Horizontal" Margin="10, 0, 5, 5">
<TextBox Name="SearchBoxNormal" Grid.Column="0" Margin="15, 5, 0, 5" HorizontalAlignment="Stretch" Watermark="{ext:Locale CompatibilityListSearchBoxWatermarkWithCount}" TextChanged="TextBox_OnTextChanged" />
<StackPanel Grid.Column="1" Orientation="Horizontal" Margin="10, 5, 5, 5">
<TextBlock
Margin="10,0"
HorizontalAlignment="Right"
@ -157,8 +158,9 @@
</DropDownButton.Flyout>
</DropDownButton>
</StackPanel>
<CheckBox Grid.Column="2" Margin="7, 0, 0, 0" IsChecked="{Binding OnlyShowOwnedGames}" />
<TextBlock Grid.Column="3" Padding="0, 0, 1, 0" Margin="-10, 0, 18, 0" Text="{ext:Locale CompatibilityListOnlyShowOwnedGames}" />
<CheckBox Grid.Column="2" Margin="20, 0, 50, 0" IsChecked="{Binding OnlyShowOwnedGames}">
<TextBlock Text="{ext:Locale CompatibilityListOnlyShowOwnedGames}" />
</CheckBox>
</Grid>
<!-- Description Field Above ScrollViewer -->
@ -206,15 +208,11 @@
Height="35"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Content="Info"
Content="{ext:Locale CompatibilityListStats}"
DockPanel.Dock="Right">
<DropDownButton.Flyout>
<Flyout Placement="Bottom">
<StackPanel>
<TextBlock
HorizontalAlignment="Left"
Padding="0,5"
Text="Compatibility verified:" />
<TextBlock
HorizontalAlignment="Left"
Foreground="{Binding IsStringPlayable, Converter={x:Static helpers:PlayabilityStatusConverter.Shared}}"

5
src/Ryujinx/UI/Windows/SettingsWindow.axaml
View File

@ -128,8 +128,9 @@
Margin="10"
Content="{ext:Locale SettingsButtonReset}"
Command="{Binding ResetButton}" />
<CheckBox IsChecked="{Binding WantsToReset}"/>
<TextBlock Text="{ext:Locale SettingsButtonResetConfirm}"/>
<CheckBox IsChecked="{Binding WantsToReset}">
<TextBlock Text="{ext:Locale SettingsButtonResetConfirm}" />
</CheckBox>
</StackPanel>
<ReversibleStackPanel
Grid.Column="2"