Further adjustments to FirmwareAvatarSelector

This commit is contained in:
_Neo_
2025-12-26 17:54:01 +02:00
parent 620eba5fcb
commit 813057acbf
3 changed files with 63 additions and 56 deletions

View File

@@ -11220,26 +11220,26 @@
{ {
"ID": "ProfileImageSelectionHeader", "ID": "ProfileImageSelectionHeader",
"Translations": { "Translations": {
"ar_SA": "اختر صورة الملف الشخصي", "ar_SA": "تحديد أفاتار البرنامج الثابت",
"de_DE": "Wähle ein Profilbild aus", "de_DE": "Firmware-Avatar auswählen",
"el_GR": "Επιλέξτε μία Εικόνα Προφίλ", "el_GR": "Επιλογή Avatar Firmware",
"en_US": "Choose a Profile Image", "en_US": "Select Firmware Avatar",
"es_ES": "Elige una Imagen de Perfil", "es_ES": "Seleccionar Avatar del Firmware",
"fr_FR": "Choisir l'Image de Profil", "fr_FR": "Sélection dun Avatar du Firmware",
"he_IL": "בחרו תמונת פרופיל", "he_IL": "בחירת אוואטר קושחה",
"it_IT": "Scegli un'immagine profilo", "it_IT": "Selezione Avatar Firmware",
"ja_JP": "プロファイル画像を選択", "ja_JP": "ファームウェアアバター選択",
"ko_KR": "프로필 이미지를 선택", "ko_KR": "펌웨어 아바타 선택",
"no_NO": "Velg et profilbilde", "no_NO": "Velg firmware-avatar",
"pl_PL": "Wybierz zdjęcie profilowe", "pl_PL": "Wybór awatara oprogramowania",
"pt_BR": "Escolha uma Imagem de Perfil", "pt_BR": "Selecionar Avatar do Firmware",
"ru_RU": "Выбор аватара", "ru_RU": "Выбор аватара прошивки",
"sv_SE": "Välj en profilbild", "sv_SE": "Välj firmware-avatar",
"th_TH": "เลือก รูปโปรไฟล์", "th_TH": "การเลือกอวตารเฟิร์มแวร์",
"tr_TR": "Profil Resmi Seç", "tr_TR": "Firmware Avatar Seçimi",
"uk_UA": "Виберіть аватара", "uk_UA": "Вибір аватара прошивки",
"zh_CN": "选择合适的头像图片", "zh_CN": "选择固件头像",
"zh_TW": "選擇設定檔圖像" "zh_TW": "選取韌體頭像"
} }
}, },
{ {

View File

@@ -132,7 +132,7 @@ namespace Ryujinx.Ava.UI.Views.User
if (ViewModel.Image == null) if (ViewModel.Image == null)
{ {
DataValidationErrors.SetError(ImageBox, new DataValidationException(LocaleManager.Instance[LocaleKeys.UserProfileEmptyNameError])); DataValidationErrors.SetError(ImageBox, null);
ImageBox.BorderBrush = Brushes.Red; ImageBox.BorderBrush = Brushes.Red;
return; return;

View File

@@ -18,43 +18,50 @@
<viewModels:UserFirmwareAvatarSelectorViewModel /> <viewModels:UserFirmwareAvatarSelectorViewModel />
</Design.DataContext> </Design.DataContext>
<Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" RowDefinitions="Auto,*,Auto,Auto"> <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" RowDefinitions="Auto,*,Auto,Auto">
<ListBox <Border
Grid.Row="1" Grid.Row="1"
BorderThickness="0" Padding="2.5"
SelectedIndex="{Binding SelectedIndex}" BorderThickness="1"
Height="400" BorderBrush="{DynamicResource AppListHoverBackgroundColor}"
ItemsSource="{Binding Images}" CornerRadius="5"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
VerticalAlignment="Center"> VerticalAlignment="Stretch">
<ListBox.ItemsPanel> <ListBox
<ItemsPanelTemplate> Grid.Row="1"
<WrapPanel Background="Transparent"
Orientation="Horizontal" SelectedIndex="{Binding SelectedIndex}"
Margin="0" Height="400"
HorizontalAlignment="Center" /> ItemsSource="{Binding Images}">
</ItemsPanelTemplate> <ListBox.ItemsPanel>
</ListBox.ItemsPanel> <ItemsPanelTemplate>
<ListBox.Styles> <WrapPanel
<Style Selector="ListBoxItem"> Orientation="Horizontal"
<Setter Property="CornerRadius" Value="4" /> Margin="0"
<Setter Property="Width" Value="85" /> HorizontalAlignment="Center" />
<Setter Property="MaxWidth" Value="85" /> </ItemsPanelTemplate>
<Setter Property="MinWidth" Value="85" /> </ListBox.ItemsPanel>
</Style> <ListBox.Styles>
<Style Selector="ListBoxItem /template/ Rectangle#SelectionIndicator"> <Style Selector="ListBoxItem">
<Setter Property="MinHeight" Value="70" /> <Setter Property="CornerRadius" Value="4" />
</Style> <Setter Property="Width" Value="85" />
</ListBox.Styles> <Setter Property="MaxWidth" Value="85" />
<ListBox.ItemTemplate> <Setter Property="MinWidth" Value="85" />
<DataTemplate> </Style>
<Panel <Style Selector="ListBoxItem /template/ Rectangle#SelectionIndicator">
Background="{Binding BackgroundColor}" <Setter Property="MinHeight" Value="70" />
Margin="5"> </Style>
<Image Source="{Binding Data, Converter={x:Static helpers:BitmapArrayValueConverter.Instance}}" /> </ListBox.Styles>
</Panel> <ListBox.ItemTemplate>
</DataTemplate> <DataTemplate>
</ListBox.ItemTemplate> <Panel
</ListBox> Background="{Binding BackgroundColor}"
Margin="5">
<Image Source="{Binding Data, Converter={x:Static helpers:BitmapArrayValueConverter.Instance}}" />
</Panel>
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
</Border>
<StackPanel <StackPanel
Grid.Row="3" Grid.Row="3"
Orientation="Horizontal" Orientation="Horizontal"