MeloNX/Ryujinx-ryubing
11
0
Fork 0
Code Issues 184 Pull Requests 15 Actions Packages Projects Releases 36 Wiki Activity

Fixed up changes to align 'locale' namespace with 'ext' namespace

Browse Source
This commit is contained in:
Aaron Murgatroyd 2024-11-04 23:21:19 +10:00
parent 21cc749cdc
commit 78dd0a858f
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml
View File

@ -72,9 +72,9 @@
<Separator /> <Separator />
<MenuItem <MenuItem
Click="TrimXCI_Click" Click="TrimXCI_Click"
Header="{locale:Locale GameListContextMenuTrimXCI}" Header="{ext:Locale GameListContextMenuTrimXCI}"
IsEnabled="{Binding TrimXCIEnabled}" IsEnabled="{Binding TrimXCIEnabled}"
ToolTip.Tip="{locale:Locale GameListContextMenuTrimXCIToolTip}" /> ToolTip.Tip="{ext:Locale GameListContextMenuTrimXCIToolTip}" />
<Separator /> <Separator />
<MenuItem Header="{ext:Locale GameListContextMenuCacheManagement}" Icon="{ext:Icon mdi-cached}"> <MenuItem Header="{ext:Locale GameListContextMenuCacheManagement}" Icon="{ext:Icon mdi-cached}">
<MenuItem <MenuItem

2
src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml
View File

@ -269,7 +269,7 @@
<MenuItem Header="{ext:Locale MenuBarToolsUninstallFileTypes}" Click="UninstallFileTypes_Click"/> <MenuItem Header="{ext:Locale MenuBarToolsUninstallFileTypes}" Click="UninstallFileTypes_Click"/>
</MenuItem> </MenuItem>
<Separator /> <Separator />
<MenuItem Header="{locale:Locale MenuBarToolsXCITrimmer}" Click="OpenXCITrimmerWindow" Icon="{icon:Icon fa-solid fa-scissors}" /> <MenuItem Header="{ext:Locale MenuBarToolsXCITrimmer}" Click="OpenXCITrimmerWindow" Icon="{ext:Icon fa-solid fa-scissors}" />
</MenuItem> </MenuItem>
<MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarView}"> <MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarView}">
<MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarViewWindow}"> <MenuItem VerticalAlignment="Center" Header="{ext:Locale MenuBarViewWindow}">

30
src/Ryujinx/UI/Windows/XCITrimmerWindow.axaml
View File

@ -3,7 +3,7 @@
xmlns="https://github.com/avaloniaui" xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale" xmlns:ext="clr-namespace:Ryujinx.Ava.Common.Markup"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels" xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
xmlns:models="clr-namespace:Ryujinx.UI.Common.Models;assembly=Ryujinx.UI.Common" xmlns:models="clr-namespace:Ryujinx.UI.Common.Models;assembly=Ryujinx.UI.Common"
@ -49,7 +49,7 @@
Margin="10,0" Margin="10,0"
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{locale:Locale CommonSort}" /> Text="{ext:Locale CommonSort}" />
<DropDownButton <DropDownButton
Width="150" Width="150"
HorizontalAlignment="Left" HorizontalAlignment="Left"
@ -64,13 +64,13 @@
<StackPanel> <StackPanel>
<RadioButton <RadioButton
Checked="Sort_Checked" Checked="Sort_Checked"
Content="{locale:Locale XCITrimmerSortName}" Content="{ext:Locale XCITrimmerSortName}"
GroupName="Sort" GroupName="Sort"
IsChecked="{Binding IsSortedByName, Mode=OneTime}" IsChecked="{Binding IsSortedByName, Mode=OneTime}"
Tag="Name" /> Tag="Name" />
<RadioButton <RadioButton
Checked="Sort_Checked" Checked="Sort_Checked"
Content="{locale:Locale XCITrimmerSortSaved}" Content="{ext:Locale XCITrimmerSortSaved}"
GroupName="Sort" GroupName="Sort"
IsChecked="{Binding IsSortedBySaved, Mode=OneTime}" IsChecked="{Binding IsSortedBySaved, Mode=OneTime}"
Tag="Saved" /> Tag="Saved" />
@ -86,13 +86,13 @@
</Border> </Border>
<RadioButton <RadioButton
Checked="Order_Checked" Checked="Order_Checked"
Content="{locale:Locale OrderAscending}" Content="{ext:Locale OrderAscending}"
GroupName="Order" GroupName="Order"
IsChecked="{Binding SortingAscending, Mode=OneTime}" IsChecked="{Binding SortingAscending, Mode=OneTime}"
Tag="Ascending" /> Tag="Ascending" />
<RadioButton <RadioButton
Checked="Order_Checked" Checked="Order_Checked"
Content="{locale:Locale OrderDescending}" Content="{ext:Locale OrderDescending}"
GroupName="Order" GroupName="Order"
IsChecked="{Binding !SortingAscending, Mode=OneTime}" IsChecked="{Binding !SortingAscending, Mode=OneTime}"
Tag="Descending" /> Tag="Descending" />
@ -107,7 +107,7 @@
MaxHeight="29" MaxHeight="29"
Margin="5 0 5 0" Margin="5 0 5 0"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
Watermark="{locale:Locale Search}" Watermark="{ext:Locale Search}"
Text="{Binding Search}" /> Text="{Binding Search}" />
<StackPanel <StackPanel
Grid.Column="2" Grid.Column="2"
@ -117,14 +117,14 @@
MinWidth="90" MinWidth="90"
Margin="5" Margin="5"
Command="{Binding SelectDisplayed}"> Command="{Binding SelectDisplayed}">
<TextBlock Text="{locale:Locale XCITrimmerSelectDisplayed}" /> <TextBlock Text="{ext:Locale XCITrimmerSelectDisplayed}" />
</Button> </Button>
<Button <Button
Name="DeselectDisplayedButton" Name="DeselectDisplayedButton"
MinWidth="90" MinWidth="90"
Margin="5" Margin="5"
Command="{Binding DeselectDisplayed}"> Command="{Binding DeselectDisplayed}">
<TextBlock Text="{locale:Locale XCITrimmerDeselectDisplayed}" /> <TextBlock Text="{ext:Locale XCITrimmerDeselectDisplayed}" />
</Button> </Button>
</StackPanel> </StackPanel>
</Grid> </Grid>
@ -193,7 +193,7 @@
IsVisible="{Binding IsFailed}"> IsVisible="{Binding IsFailed}">
<TextBlock <TextBlock
Classes="h1" Classes="h1"
Text="{locale:Locale XCITrimmerTitleStatusFailed}" /> Text="{ext:Locale XCITrimmerTitleStatusFailed}" />
<TextBlock <TextBlock
Text="{Binding ., Converter={StaticResource StatusDetailLabel}}" Text="{Binding ., Converter={StaticResource StatusDetailLabel}}"
MaxLines="5" MaxLines="5"
@ -249,7 +249,7 @@
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
MaxLines="1" MaxLines="1"
Text="{locale:Locale XCITrimmerPotentialSavings}" /> Text="{ext:Locale XCITrimmerPotentialSavings}" />
<TextBlock <TextBlock
Grid.Column="0" Grid.Column="0"
Grid.Row="1" Grid.Row="1"
@ -258,7 +258,7 @@
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
MaxLines="1" MaxLines="1"
Text="{locale:Locale XCITrimmerActualSavings}" /> Text="{ext:Locale XCITrimmerActualSavings}" />
<TextBlock <TextBlock
Grid.Column="1" Grid.Column="1"
Grid.Row="0" Grid.Row="0"
@ -324,7 +324,7 @@
<Binding Path="Cancel" /> <Binding Path="Cancel" />
</MultiBinding> </MultiBinding>
</Button.IsVisible> </Button.IsVisible>
<TextBlock Text="{locale:Locale InputDialogCancelling}" /> <TextBlock Text="{ext:Locale InputDialogCancelling}" />
</Button> </Button>
<Button <Button
Name="CancelButton" Name="CancelButton"
@ -337,7 +337,7 @@
<Binding Path="!Cancel" /> <Binding Path="!Cancel" />
</MultiBinding> </MultiBinding>
</Button.IsVisible> </Button.IsVisible>
<TextBlock Text="{locale:Locale InputDialogCancel}" /> <TextBlock Text="{ext:Locale InputDialogCancel}" />
</Button> </Button>
<Button <Button
Name="CloseButton" Name="CloseButton"
@ -345,7 +345,7 @@
Margin="5" Margin="5"
Click="Close" Click="Close"
IsVisible="{Binding !Processing}"> IsVisible="{Binding !Processing}">
<TextBlock Text="{locale:Locale InputDialogClose}" /> <TextBlock Text="{ext:Locale InputDialogClose}" />
</Button> </Button>
</StackPanel> </StackPanel>
</Grid> </Grid>