From c9e15b31b706658a914feba650ac1b309d863f5b Mon Sep 17 00:00:00 2001
From: Isaac Marovitz <isaacryu@icloud.com>
Date: Sun, 15 Jan 2023 16:21:45 -0500
Subject: [PATCH] Buttons

---
 .../DownloadableContentManagerWindow.axaml    | 55 +------------------
 .../DownloadableContentManagerWindow.axaml.cs | 20 ++++---
 2 files changed, 13 insertions(+), 62 deletions(-)

diff --git a/Ryujinx.Ava/UI/Windows/DownloadableContentManagerWindow.axaml b/Ryujinx.Ava/UI/Windows/DownloadableContentManagerWindow.axaml
index db7c63a8a..e0d847642 100644
--- a/Ryujinx.Ava/UI/Windows/DownloadableContentManagerWindow.axaml
+++ b/Ryujinx.Ava/UI/Windows/DownloadableContentManagerWindow.axaml
@@ -28,55 +28,9 @@
             BorderThickness="1"
             CornerRadius="5"
             Padding="2.5">
-            <!--
-            <ScrollViewer
-                VerticalAlignment="Stretch"
-                HorizontalScrollBarVisibility="Auto"
-                VerticalScrollBarVisibility="Auto">
-                <DataGrid
-                    Name="DlcDataGrid"
-                    MinHeight="200"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Stretch"
-                    Items="{Binding DownloadableContents}"
-                    SelectionMode="Extended">
-                    <DataGrid.Columns>
-                        <DataGridTemplateColumn Width="90">
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate
-                                    DataType="models:DownloadableContentModel">
-                                    <CheckBox
-                                        Width="50"
-                                        MinWidth="40"
-                                        HorizontalAlignment="Center"
-                                        IsChecked="{Binding Enabled}" />
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                            <DataGridTemplateColumn.Header>
-                                <TextBlock Text="{locale:Locale DlcManagerTableHeadingEnabledLabel}" />
-                            </DataGridTemplateColumn.Header>
-                        </DataGridTemplateColumn>
-                        <DataGridTextColumn Width="140" Binding="{Binding TitleId}">
-                            <DataGridTextColumn.Header>
-                                <TextBlock Text="{locale:Locale DlcManagerTableHeadingTitleIdLabel}" />
-                            </DataGridTextColumn.Header>
-                        </DataGridTextColumn>
-                        <DataGridTextColumn Width="280" Binding="{Binding FullPath}">
-                            <DataGridTextColumn.Header>
-                                <TextBlock Text="{locale:Locale DlcManagerTableHeadingFullPathLabel}" />
-                            </DataGridTextColumn.Header>
-                        </DataGridTextColumn>
-                        <DataGridTextColumn Binding="{Binding ContainerPath}">
-                            <DataGridTextColumn.Header>
-                                <TextBlock Text="{locale:Locale DlcManagerTableHeadingContainerPathLabel}" />
-                            </DataGridTextColumn.Header>
-                        </DataGridTextColumn>
-                    </DataGrid.Columns>
-                </DataGrid>
-            </ScrollViewer>
-            -->
             <ListBox
                 VirtualizationMode="None"
+                SelectionMode="Multiple"
                 Background="Transparent"
                 SelectedItems="{Binding SelectedDLCs, Mode=TwoWay}"
                 Items="{Binding DownloadableContents}">
@@ -142,13 +96,6 @@
                     Command="{ReflectionBinding Add}">
                     <TextBlock Text="{locale:Locale SettingsTabGeneralAdd}" />
                 </Button>
-                <Button
-                    Name="RemoveButton"
-                    MinWidth="90"
-                    Margin="5"
-                    Command="{ReflectionBinding RemoveSelected}">
-                    <TextBlock Text="{locale:Locale SettingsTabGeneralRemove}" />
-                </Button>
                 <Button
                     Name="RemoveAllButton"
                     MinWidth="90"
diff --git a/Ryujinx.Ava/UI/Windows/DownloadableContentManagerWindow.axaml.cs b/Ryujinx.Ava/UI/Windows/DownloadableContentManagerWindow.axaml.cs
index 2c5d640d6..7f4ee631c 100644
--- a/Ryujinx.Ava/UI/Windows/DownloadableContentManagerWindow.axaml.cs
+++ b/Ryujinx.Ava/UI/Windows/DownloadableContentManagerWindow.axaml.cs
@@ -4,9 +4,12 @@ using Avalonia.Styling;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Helpers;
+using Ryujinx.Ava.UI.Models;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.HLE.FileSystem;
+using Ryujinx.Ui.Common.Helper;
 using System.Threading.Tasks;
+using Button = FluentAvalonia.UI.Controls.Button;
 
 namespace Ryujinx.Ava.UI.Windows
 {
@@ -27,7 +30,7 @@ namespace Ryujinx.Ava.UI.Windows
 
             InitializeComponent();
 
-            RemoveButton.IsEnabled = false;
+            // RemoveButton.IsEnabled = false;
 
             // DlcDataGrid.SelectionChanged += DlcDataGrid_SelectionChanged;
         }
@@ -51,11 +54,6 @@ namespace Ryujinx.Ava.UI.Windows
             await ContentDialogHelper.ShowAsync(contentDialog);
         }
 
-        private void DlcDataGrid_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-           //  RemoveButton.IsEnabled = (DlcDataGrid.SelectedItems.Count > 0);
-        }
-
         public void SaveAndClose()
         {
             ViewModel.Save();
@@ -64,12 +62,18 @@ namespace Ryujinx.Ava.UI.Windows
 
         private void RemoveDLC(object sender, RoutedEventArgs e)
         {
-            throw new System.NotImplementedException();
+            ViewModel.RemoveSelected();
         }
 
         private void OpenLocation(object sender, RoutedEventArgs e)
         {
-            throw new System.NotImplementedException();
+            if (sender is Button button)
+            {
+                if (button.DataContext is DownloadableContentModel model)
+                {
+                    OpenHelper.LocateFile(model.ContainerPath);
+                }
+            }
         }
     }
 }
\ No newline at end of file