bel
/
ryubing
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing the MR due to errors in merge

merge-requests/173/head
_Neo_ 2025-10-25 14:52:58 +03:00
parent d52415b535
commit af5d9a90b7
3 changed files with 36 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Ryujinx/UI/Views/User/UserEditorView.axaml
View File

@ -92,20 +92,24 @@
Spacing="10">
<Button
Name="DeleteButton"
Click="DeleteButton_Click"
Content="{ext:Locale UserProfilesDelete}" />
Click="DeleteButton_Click">
<TextBlock Text="{ext:Locale UserProfilesDelete}" />
</Button>
<Button
Name="ChangePictureButton"
Click="ChangePictureButton_Click"
Content="{ext:Locale UserProfilesChangeProfileImage}" />
Click="ChangePictureButton_Click">
<TextBlock Text="{ext:Locale UserProfilesChangeProfileImage}" />
</Button>
<Button
Name="AddPictureButton"
Click="ChangePictureButton_Click"
Content="{ext:Locale UserProfilesSetProfileImage}" />
Click="ChangePictureButton_Click">
<TextBlock Text="{ext:Locale UserProfilesSetProfileImage}" />
</Button>
<Button
Name="SaveButton"
Click="SaveButton_Click"
Content="{ext:Locale Save}" />
Click="SaveButton_Click">
<TextBlock Text="{ext:Locale UserProfilesSetProfileImage}" />
</Button>
</StackPanel>
</Grid>
</UserControl>

29
src/Ryujinx/UI/Views/User/UserSaveManagerView.axaml
View File

@ -29,38 +29,26 @@
Orientation="Horizontal"
HorizontalAlignment="Left"
VerticalAlignment="Center">
<ComboBox SelectedIndex="{Binding SortIndex}" Width="100">
<ComboBoxItem>
<Label
VerticalAlignment="Center"
<ComboBox SelectedIndex="{Binding SortIndex}"
HorizontalContentAlignment="Left"
MinWidth="100">
<ComboBoxItem
Content="{ext:Locale Name}" />
</ComboBoxItem>
<ComboBoxItem>
<Label
VerticalAlignment="Center"
HorizontalContentAlignment="Left"
<ComboBoxItem
Content="{ext:Locale Size}" />
</ComboBoxItem>
<ComboBox.Styles>
<Style Selector="ContentControl#ContentPresenter">
<Setter Property="HorizontalAlignment" Value="Left" />
</Style>
</ComboBox.Styles>
</ComboBox>
<ComboBox SelectedIndex="{Binding OrderIndex}" Width="150">
<ComboBoxItem>
<Label
VerticalAlignment="Center"
<ComboBox SelectedIndex="{Binding OrderIndex}"
HorizontalContentAlignment="Left"
MinWidth="150">
<ComboBoxItem
Content="{ext:Locale OrderAscending}" />
</ComboBoxItem>
<ComboBoxItem>
<Label
VerticalAlignment="Center"
HorizontalContentAlignment="Left"
<ComboBoxItem
Content="{ext:Locale OrderDescending}" />
</ComboBoxItem>
<ComboBox.Styles>
<Style Selector="ContentControl#ContentPresenter">
<Setter Property="HorizontalAlignment" Value="Left" />
@ -72,6 +60,7 @@
Grid.Column="1"
HorizontalAlignment="Stretch"
Margin="20,0,0,10" ColumnDefinitions="Auto,*">
<TextBlock Text="{ext:Locale Search}" VerticalAlignment="Center" />
<TextBox
Margin="5,0,0,0"
Grid.Column="1"

15
src/Ryujinx/UI/Views/User/UserSelectorView.axaml
View File

@ -137,11 +137,13 @@
Orientation="Horizontal"
Spacing="10">
<Button
Click="ManageSaves"
Content="{ext:Locale UserProfilesManageSaves}" />
Click="ManageSaves">
<TextBlock Text="{ext:Locale UserProfilesManageSaves}" />
</Button>
<Button
Click="RecoverLostAccounts"
Content="{ext:Locale UserProfilesRecoverLostAccounts}" />
Click="RecoverLostAccounts">
<TextBlock Text="{ext:Locale UserProfilesRecoverLostAccounts}" />
</Button>
</StackPanel>
<StackPanel
Grid.Row="1"
@ -149,8 +151,9 @@
HorizontalAlignment="Right"
Orientation="Horizontal">
<Button
Click="Close"
Content="{ext:Locale UserProfilesClose}" />
Click="Close">
<TextBlock Text="{ext:Locale UserProfilesClose}" />
</Button>
</StackPanel>
</Grid>
</UserControl>