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"> Spacing="10">
<Button <Button
Name="DeleteButton" Name="DeleteButton"
Click="DeleteButton_Click" Click="DeleteButton_Click">
Content="{ext:Locale UserProfilesDelete}" /> <TextBlock Text="{ext:Locale UserProfilesDelete}" />
</Button>
<Button <Button
Name="ChangePictureButton" Name="ChangePictureButton"
Click="ChangePictureButton_Click" Click="ChangePictureButton_Click">
Content="{ext:Locale UserProfilesChangeProfileImage}" /> <TextBlock Text="{ext:Locale UserProfilesChangeProfileImage}" />
</Button>
<Button <Button
Name="AddPictureButton" Name="AddPictureButton"
Click="ChangePictureButton_Click" Click="ChangePictureButton_Click">
Content="{ext:Locale UserProfilesSetProfileImage}" /> <TextBlock Text="{ext:Locale UserProfilesSetProfileImage}" />
</Button>
<Button <Button
Name="SaveButton" Name="SaveButton"
Click="SaveButton_Click" Click="SaveButton_Click">
Content="{ext:Locale Save}" /> <TextBlock Text="{ext:Locale UserProfilesSetProfileImage}" />
</Button>
</StackPanel> </StackPanel>
</Grid> </Grid>
</UserControl> </UserControl>

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

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

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

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