crafterpika/ryujinx
1
0
Fork 0
mirror of https://git.ryujinx.app/ryubing/ryujinx.git synced 2025-07-24 23:47:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

Avalonia: Move LocaleExtension & IconExtension into one namespace to simplify the usage sites in the markup.

Browse source
This commit is contained in:
Evan Husted 2024-11-01 13:00:56 -05:00
parent 6911e288bc
commit 4c83794254
36 changed files with 599 additions and 602 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/Ryujinx/UI/Views/User/UserEditorView.axaml
View file

@ -2,7 +2,7 @@
x:Class="Ryujinx.Ava.UI.Views.User.UserEditorView"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@ -32,15 +32,15 @@
HorizontalAlignment="Stretch"
Orientation="Vertical"
Spacing="10">
<TextBlock Text="{locale:Locale UserProfilesName}" />
<TextBlock Text="{ext:Locale UserProfilesName}" />
<TextBox
Name="NameBox"
Width="300"
HorizontalAlignment="Stretch"
MaxLength="{Binding MaxProfileNameLength}"
Watermark="{locale:Locale ProfileNameSelectionWatermark}"
Watermark="{ext:Locale ProfileNameSelectionWatermark}"
Text="{Binding Name}" />
<TextBlock Name="IdText" Text="{locale:Locale UserProfilesUserId}" />
<TextBlock Name="IdText" Text="{ext:Locale UserProfilesUserId}" />
<TextBox
Name="IdLabel"
Width="300"
@ -104,19 +104,19 @@
<Button
Name="DeleteButton"
Click="DeleteButton_Click"
Content="{locale:Locale UserProfilesDelete}" />
Content="{ext:Locale UserProfilesDelete}" />
<Button
Name="ChangePictureButton"
Click="ChangePictureButton_Click"
Content="{locale:Locale UserProfilesChangeProfileImage}" />
Content="{ext:Locale UserProfilesChangeProfileImage}" />
<Button
Name="AddPictureButton"
Click="ChangePictureButton_Click"
Content="{locale:Locale UserProfilesSetProfileImage}" />
Content="{ext:Locale UserProfilesSetProfileImage}" />
<Button
Name="SaveButton"
Click="SaveButton_Click"
Content="{locale:Locale Save}" />
Content="{ext:Locale Save}" />
</StackPanel>
</Grid>
</UserControl>
</UserControl>

6
src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml
View file

@ -9,7 +9,7 @@
d:DesignWidth="578"
d:DesignHeight="350"
x:Class="Ryujinx.Ava.UI.Views.User.UserFirmwareAvatarSelectorView"
xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
x:DataType="viewModels:UserFirmwareAvatarSelectorViewModel"
@ -104,10 +104,10 @@
</ui:ColorPickerButton.Styles>
</ui:ColorPickerButton>
<Button
Content="{locale:Locale AvatarChoose}"
Content="{ext:Locale AvatarChoose}"
Height="35"
Name="ChooseButton"
Click="ChooseButton_OnClick" />
</StackPanel>
</Grid>
</UserControl>
</UserControl>

8
src/Ryujinx/UI/Views/User/UserProfileImageSelectorView.axaml
View file

@ -4,7 +4,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
xmlns:viewModles="clr-namespace:Ryujinx.Ava.UI.ViewModels"
Focusable="True"
mc:Ignorable="d"
@ -28,7 +28,7 @@
TextWrapping="Wrap"
HorizontalAlignment="Left"
TextAlignment="Start"
Text="{locale:Locale ProfileImageSelectionNote}" />
Text="{ext:Locale ProfileImageSelectionNote}" />
<StackPanel
Grid.Row="2"
Spacing="10"
@ -49,13 +49,13 @@
<Button
Name="Import"
Click="Import_OnClick">
<TextBlock Text="{locale:Locale ProfileImageSelectionImportImage}" />
<TextBlock Text="{ext:Locale ProfileImageSelectionImportImage}" />
</Button>
<Button
Name="SelectFirmwareImage"
IsEnabled="{Binding FirmwareFound}"
Click="SelectFirmwareImage_OnClick">
<TextBlock Text="{locale:Locale ProfileImageSelectionSelectAvatar}" />
<TextBlock Text="{ext:Locale ProfileImageSelectionSelectAvatar}" />
</Button>
</StackPanel>
</Grid>

6
src/Ryujinx/UI/Views/User/UserRecovererView.axaml
View file

@ -8,7 +8,7 @@
d:DesignHeight="450"
Width="500"
Height="400"
xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
x:Class="Ryujinx.Ava.UI.Views.User.UserRecovererView"
@ -55,7 +55,7 @@
HorizontalAlignment="Right"
Click="Recover"
CommandParameter="{Binding}"
Content="{locale:Locale Recover}"/>
Content="{ext:Locale Recover}"/>
</Grid>
</Border>
</DataTemplate>
@ -64,7 +64,7 @@
<TextBlock
IsVisible="{Binding IsEmpty}"
TextAlignment="Center"
Text="{locale:Locale UserProfilesRecoverEmptyList}"/>
Text="{ext:Locale UserProfilesRecoverEmptyList}"/>
</Panel>
</Border>
<StackPanel

16
src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml
View file

@ -4,7 +4,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
xmlns:models="clr-namespace:Ryujinx.Ava.UI.Models"
xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
@ -40,19 +40,19 @@
Orientation="Horizontal"
HorizontalAlignment="Left"
VerticalAlignment="Center">
<Label Content="{locale:Locale CommonSort}" VerticalAlignment="Center" />
<Label Content="{ext:Locale CommonSort}" VerticalAlignment="Center" />
<ComboBox SelectedIndex="{Binding SortIndex}" Width="100">
<ComboBoxItem>
<Label
VerticalAlignment="Center"
HorizontalContentAlignment="Left"
Content="{locale:Locale Name}" />
Content="{ext:Locale Name}" />
</ComboBoxItem>
<ComboBoxItem>
<Label
VerticalAlignment="Center"
HorizontalContentAlignment="Left"
Content="{locale:Locale Size}" />
Content="{ext:Locale Size}" />
</ComboBoxItem>
<ComboBox.Styles>
<Style Selector="ContentControl#ContentPresenter">
@ -65,13 +65,13 @@
<Label
VerticalAlignment="Center"
HorizontalContentAlignment="Left"
Content="{locale:Locale OrderAscending}" />
Content="{ext:Locale OrderAscending}" />
</ComboBoxItem>
<ComboBoxItem>
<Label
VerticalAlignment="Center"
HorizontalContentAlignment="Left"
Content="{locale:Locale OrderDescending}" />
Content="{ext:Locale OrderDescending}" />
</ComboBoxItem>
<ComboBox.Styles>
<Style Selector="ContentControl#ContentPresenter">
@ -88,7 +88,7 @@
<ColumnDefinition Width="Auto"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<Label Content="{locale:Locale Search}" VerticalAlignment="Center" />
<Label Content="{ext:Locale Search}" VerticalAlignment="Center" />
<TextBox
Margin="5,0,0,0"
Grid.Column="1"
@ -210,4 +210,4 @@
</Button>
</StackPanel>
</Grid>
</UserControl>
</UserControl>

8
src/Ryujinx/UI/Views/User/UserSelectorView.axaml
View file

@ -2,7 +2,7 @@
x:Class="Ryujinx.Ava.UI.Views.User.UserSelectorViews"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
@ -144,10 +144,10 @@
Spacing="10">
<Button
Click="ManageSaves"
Content="{locale:Locale UserProfilesManageSaves}" />
Content="{ext:Locale UserProfilesManageSaves}" />
<Button
Click="RecoverLostAccounts"
Content="{locale:Locale UserProfilesRecoverLostAccounts}" />
Content="{ext:Locale UserProfilesRecoverLostAccounts}" />
</StackPanel>
<StackPanel
Grid.Row="1"
@ -156,7 +156,7 @@
Orientation="Horizontal">
<Button
Click="Close"
Content="{locale:Locale UserProfilesClose}" />
Content="{ext:Locale UserProfilesClose}" />
</StackPanel>
</Grid>
</UserControl>