UI: Move DLC RomFS dumping under normal RomFS dumping.

Also removed it from DLC manager.
This commit is contained in:
Evan Husted 2025-01-20 14:30:28 -06:00
parent f42b2ed59d
commit 04ba762710
13 changed files with 259 additions and 46 deletions

View file

@ -7,7 +7,6 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
xmlns:pi="using:Projektanker.Icons.Avalonia"
xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
xmlns:models="clr-namespace:Ryujinx.Ava.Common.Models"
Width="500"
@ -15,9 +14,6 @@
mc:Ignorable="d"
x:DataType="viewModels:DownloadableContentManagerViewModel"
Focusable="True">
<UserControl.Resources>
<helpers:DownloadableContentLabelConverter x:Key="DownloadableContentLabel" />
</UserControl.Resources>
<Grid RowDefinitions="Auto,Auto,*,Auto">
<StackPanel
Grid.Row="0"
@ -102,7 +98,7 @@
TextWrapping="Wrap"
TextTrimming="CharacterEllipsis">
<TextBlock.Text>
<MultiBinding Converter="{StaticResource DownloadableContentLabel}">
<MultiBinding Converter="{x:Static helpers:DownloadableContentLabelConverter.Instance}">
<Binding Path="FileName" />
<Binding Path="IsBundled" />
</MultiBinding>
@ -113,22 +109,13 @@
Margin="10 0"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Text="{Binding TitleId}" />
Text="{Binding TitleIdStr}" />
</Grid>
<StackPanel
Grid.Column="1"
Spacing="10"
Orientation="Horizontal"
HorizontalAlignment="Right">
<Button
VerticalAlignment="Center"
HorizontalAlignment="Right"
Padding="10"
MinWidth="0"
MinHeight="0"
Click="DlcItem_DumpRomfs">
<ui:SymbolIcon Symbol="MoveToFolder"/>
</Button>
<Button
VerticalAlignment="Center"
HorizontalAlignment="Right"

View file

@ -95,18 +95,5 @@ namespace Ryujinx.Ava.UI.Windows
}
}
}
private async void DlcItem_DumpRomfs(object sender, RoutedEventArgs e)
{
if (sender is not Button { DataContext: DownloadableContentModel dlc }) return;
if (RyujinxApp.MainWindow.ViewModel is not { } viewModel)
return;
await ApplicationHelper.ExtractAoc(
viewModel.StorageProvider,
NcaSectionType.Data,
dlc.ContainerPath,
dlc.FileName);
}
}
}