mirror of
https://git.ryujinx.app/ryubing/ryujinx.git
synced 2025-08-14 01:06:50 +00:00
UI Updates Batch 2 (ryubing/ryujinx!105)
See merge request ryubing/ryujinx!105
This commit is contained in:
parent
c6f22318a7
commit
ae2e9a73ab
@ -23693,28 +23693,28 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"ID": "CompatibilityListInfo",
|
"ID": "CompatibilityListStats",
|
||||||
"Translations": {
|
"Translations": {
|
||||||
"ar_SA": "",
|
"ar_SA": "",
|
||||||
"de_DE": "",
|
"de_DE": "",
|
||||||
"el_GR": "Πληροφορίες",
|
"el_GR": "",
|
||||||
"en_US": "Info",
|
"en_US": "Stats",
|
||||||
"es_ES": "Información",
|
"es_ES": null,
|
||||||
"fr_FR": "",
|
"fr_FR": null,
|
||||||
"he_IL": "מידע",
|
"he_IL": "",
|
||||||
"it_IT": "",
|
"it_IT": "",
|
||||||
"ja_JP": "情報",
|
"ja_JP": "",
|
||||||
"ko_KR": "정보",
|
"ko_KR": "",
|
||||||
"no_NO": "",
|
"no_NO": "",
|
||||||
"pl_PL": "Informacja",
|
"pl_PL": "",
|
||||||
"pt_BR": "",
|
"pt_BR": "",
|
||||||
"ru_RU": "Инфо",
|
"ru_RU": "Данные",
|
||||||
"sv_SE": "",
|
"sv_SE": "",
|
||||||
"th_TH": "รายละเอียด",
|
"th_TH": "",
|
||||||
"tr_TR": "Bilgi",
|
"tr_TR": "",
|
||||||
"uk_UA": "Інфо",
|
"uk_UA": "",
|
||||||
"zh_CN": "信息",
|
"zh_CN": "",
|
||||||
"zh_TW": "資訊"
|
"zh_TW": ""
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -266,7 +266,7 @@
|
|||||||
</Style>
|
</Style>
|
||||||
<Style Selector="ToggleButton">
|
<Style Selector="ToggleButton">
|
||||||
<Setter Property="Padding"
|
<Setter Property="Padding"
|
||||||
Value="0,-5,0,0" />
|
Value="0,0,0,0" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="TabItem">
|
<Style Selector="TabItem">
|
||||||
<Setter Property="FontSize"
|
<Setter Property="FontSize"
|
||||||
@ -336,7 +336,7 @@
|
|||||||
</Style>
|
</Style>
|
||||||
<Style Selector="CheckBox TextBlock">
|
<Style Selector="CheckBox TextBlock">
|
||||||
<Setter Property="Margin"
|
<Setter Property="Margin"
|
||||||
Value="0,5,0,0" />
|
Value="0,2,0,0" />
|
||||||
</Style>
|
</Style>
|
||||||
<Style Selector="TextBlock.globalConfigMarker" >
|
<Style Selector="TextBlock.globalConfigMarker" >
|
||||||
<Setter Property="Foreground" Value="SeaGreen"/>
|
<Setter Property="Foreground" Value="SeaGreen"/>
|
||||||
|
@ -482,7 +482,10 @@ namespace Ryujinx.Ava.Systems
|
|||||||
|
|
||||||
Dispatcher.UIThread.InvokeAsync(() =>
|
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);
|
_viewModel.SetUiProgressHandlers(Device);
|
||||||
@ -902,7 +905,10 @@ namespace Ryujinx.Ava.Systems
|
|||||||
|
|
||||||
_viewModel.IsPaused = false;
|
_viewModel.IsPaused = false;
|
||||||
_playTimer.Start();
|
_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");
|
Logger.Info?.Print(LogClass.Emulation, "Emulation was resumed");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -912,7 +918,10 @@ namespace Ryujinx.Ava.Systems
|
|||||||
|
|
||||||
_viewModel.IsPaused = true;
|
_viewModel.IsPaused = true;
|
||||||
_playTimer.Stop();
|
_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");
|
Logger.Info?.Print(LogClass.Emulation, "Emulation was paused");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -15,11 +15,11 @@ namespace Ryujinx.Ava.UI.Helpers
|
|||||||
public object Convert(object value, Type _, object __, CultureInfo ___)
|
public object Convert(object value, Type _, object __, CultureInfo ___)
|
||||||
=> value.Cast<LocaleKeys>() switch
|
=> value.Cast<LocaleKeys>() switch
|
||||||
{
|
{
|
||||||
LocaleKeys.CompatibilityListNothing or
|
LocaleKeys.CompatibilityListNothing => Brushes.DarkGray,
|
||||||
LocaleKeys.CompatibilityListBoots or
|
LocaleKeys.CompatibilityListBoots => Brushes.Red,
|
||||||
LocaleKeys.CompatibilityListMenus => Brushes.Red,
|
LocaleKeys.CompatibilityListMenus => Brushes.Tomato,
|
||||||
LocaleKeys.CompatibilityListIngame => Brushes.DarkOrange,
|
LocaleKeys.CompatibilityListIngame => Brushes.Orange,
|
||||||
_ => Brushes.ForestGreen
|
_ => Brushes.LimeGreen
|
||||||
};
|
};
|
||||||
|
|
||||||
public object ConvertBack(object value, Type _, object __, CultureInfo ___)
|
public object ConvertBack(object value, Type _, object __, CultureInfo ___)
|
||||||
|
@ -47,13 +47,13 @@
|
|||||||
Glyph="{helpers:GlyphValueConverter Grid}" />
|
Glyph="{helpers:GlyphValueConverter Grid}" />
|
||||||
</Button>
|
</Button>
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Margin="10,0"
|
Margin="10,0,5,0"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Text="{ext:Locale IconSize}" />
|
Text="{ext:Locale IconSize}" />
|
||||||
<controls:SliderScroll
|
<controls:SliderScroll
|
||||||
Width="150"
|
Width="150"
|
||||||
Height="35"
|
Height="35"
|
||||||
Margin="5,-10,5,0"
|
Margin="5,-12,10,0"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
IsSnapToTickEnabled="True"
|
IsSnapToTickEnabled="True"
|
||||||
SmallChange="1"
|
SmallChange="1"
|
||||||
@ -62,11 +62,11 @@
|
|||||||
TickFrequency="1"
|
TickFrequency="1"
|
||||||
Value="{Binding GridSizeScale}" />
|
Value="{Binding GridSizeScale}" />
|
||||||
<CheckBox
|
<CheckBox
|
||||||
Margin="0"
|
Margin="0,-2,0,0"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
IsChecked="{Binding ShowNames, Mode=TwoWay}"
|
IsChecked="{Binding ShowNames, Mode=TwoWay}"
|
||||||
IsVisible="{Binding IsGrid}">
|
IsVisible="{Binding IsGrid}">
|
||||||
<TextBlock Margin="5,3,0,0" Text="{ext:Locale CommonShowNames}" />
|
<TextBlock Text="{ext:Locale CommonShowNames}" />
|
||||||
</CheckBox>
|
</CheckBox>
|
||||||
<TextBox
|
<TextBox
|
||||||
Name="SearchBox"
|
Name="SearchBox"
|
||||||
|
@ -117,8 +117,9 @@
|
|||||||
<ToggleButton Name="TurboMode">
|
<ToggleButton Name="TurboMode">
|
||||||
<TextBlock Text="{Binding KeyboardHotkey.TurboMode, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
|
<TextBlock Text="{Binding KeyboardHotkey.TurboMode, Converter={x:Static helpers:KeyValueConverter.Instance}}" />
|
||||||
</ToggleButton>
|
</ToggleButton>
|
||||||
<TextBlock Text="{ext:Locale SettingsTabHotkeysOnlyWhilePressed}" Margin="10,0" />
|
<CheckBox IsChecked="{Binding KeyboardHotkey.TurboModeWhileHeld}" Margin="10,0,0,0">
|
||||||
<CheckBox IsChecked="{Binding KeyboardHotkey.TurboModeWhileHeld}" />
|
<TextBlock Text="{ext:Locale SettingsTabHotkeysOnlyWhilePressed}" />
|
||||||
|
</CheckBox>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Border>
|
</Border>
|
||||||
|
@ -88,14 +88,15 @@
|
|||||||
</DropDownButton.Flyout>
|
</DropDownButton.Flyout>
|
||||||
</DropDownButton>
|
</DropDownButton>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<CheckBox Grid.Column="3" Margin="7, 0, 0, 0" IsChecked="{Binding OnlyShowOwnedGames}" />
|
<CheckBox Grid.Column="3" Margin="20, 0, 50, 0" IsChecked="{Binding OnlyShowOwnedGames}">
|
||||||
<TextBlock Grid.Column="4" Padding="0, 0, 138, 0" Margin="-10, 0, 18, 0" Text="{ext:Locale CompatibilityListOnlyShowOwnedGames}" />
|
<TextBlock Text="{ext:Locale CompatibilityListOnlyShowOwnedGames}" />
|
||||||
|
</CheckBox>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
<!-- UI NormalControls -->
|
<!-- UI NormalControls -->
|
||||||
<Grid Grid.Row="0" ColumnDefinitions="*,Auto,Auto,Auto" Name="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" />
|
<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, 0, 5, 5">
|
<StackPanel Grid.Column="1" Orientation="Horizontal" Margin="10, 5, 5, 5">
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Margin="10,0"
|
Margin="10,0"
|
||||||
HorizontalAlignment="Right"
|
HorizontalAlignment="Right"
|
||||||
@ -157,8 +158,9 @@
|
|||||||
</DropDownButton.Flyout>
|
</DropDownButton.Flyout>
|
||||||
</DropDownButton>
|
</DropDownButton>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<CheckBox Grid.Column="2" Margin="7, 0, 0, 0" IsChecked="{Binding OnlyShowOwnedGames}" />
|
<CheckBox Grid.Column="2" Margin="20, 0, 50, 0" IsChecked="{Binding OnlyShowOwnedGames}">
|
||||||
<TextBlock Grid.Column="3" Padding="0, 0, 1, 0" Margin="-10, 0, 18, 0" Text="{ext:Locale CompatibilityListOnlyShowOwnedGames}" />
|
<TextBlock Text="{ext:Locale CompatibilityListOnlyShowOwnedGames}" />
|
||||||
|
</CheckBox>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
<!-- Description Field Above ScrollViewer -->
|
<!-- Description Field Above ScrollViewer -->
|
||||||
@ -206,15 +208,11 @@
|
|||||||
Height="35"
|
Height="35"
|
||||||
HorizontalAlignment="Right"
|
HorizontalAlignment="Right"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Content="Info"
|
Content="{ext:Locale CompatibilityListStats}"
|
||||||
DockPanel.Dock="Right">
|
DockPanel.Dock="Right">
|
||||||
<DropDownButton.Flyout>
|
<DropDownButton.Flyout>
|
||||||
<Flyout Placement="Bottom">
|
<Flyout Placement="Bottom">
|
||||||
<StackPanel>
|
<StackPanel>
|
||||||
<TextBlock
|
|
||||||
HorizontalAlignment="Left"
|
|
||||||
Padding="0,5"
|
|
||||||
Text="Compatibility verified:" />
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
HorizontalAlignment="Left"
|
HorizontalAlignment="Left"
|
||||||
Foreground="{Binding IsStringPlayable, Converter={x:Static helpers:PlayabilityStatusConverter.Shared}}"
|
Foreground="{Binding IsStringPlayable, Converter={x:Static helpers:PlayabilityStatusConverter.Shared}}"
|
||||||
|
@ -128,8 +128,9 @@
|
|||||||
Margin="10"
|
Margin="10"
|
||||||
Content="{ext:Locale SettingsButtonReset}"
|
Content="{ext:Locale SettingsButtonReset}"
|
||||||
Command="{Binding ResetButton}" />
|
Command="{Binding ResetButton}" />
|
||||||
<CheckBox IsChecked="{Binding WantsToReset}"/>
|
<CheckBox IsChecked="{Binding WantsToReset}">
|
||||||
<TextBlock Text="{ext:Locale SettingsButtonResetConfirm}"/>
|
<TextBlock Text="{ext:Locale SettingsButtonResetConfirm}" />
|
||||||
|
</CheckBox>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<ReversibleStackPanel
|
<ReversibleStackPanel
|
||||||
Grid.Column="2"
|
Grid.Column="2"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user