Changed from a dropdown list to a TreeView for outputs browser

StabilityMatrix.Avalonia/DesignData/DesignData.cs

@@ -507,6 +507,16 @@ public static class DesignData
                     }
                 )
             };
+            vm.Categories =
+            [
+                new PackageOutputCategory
+                {
+                    Name = "Category 1",
+                    Path = "path1",
+                    SubDirectories = [new PackageOutputCategory { Name = "SubCategory 1", Path = "path3" }]
+                },
+                new PackageOutputCategory { Name = "Category 2", Path = "path2" }
+            ];
             return vm;
         }
     }

StabilityMatrix.Avalonia/Models/PackageOutputCategory.cs

@@ -1,7 +1,10 @@
-namespace StabilityMatrix.Avalonia.Models;
+using System.Collections.ObjectModel;
+
+namespace StabilityMatrix.Avalonia.Models;
 
 public class PackageOutputCategory
 {
+    public ObservableCollection<PackageOutputCategory> SubDirectories { get; set; } = new();
     public required string Name { get; set; }
     public required string Path { get; set; }
 }

StabilityMatrix.Avalonia/ViewModels/OutputsPageViewModel.cs

@@ -86,6 +86,9 @@ public partial class OutputsPageViewModel : PageViewModelBase
     [ObservableProperty]
     private bool isConsolidating;
 
+    [ObservableProperty]
+    private bool showFolders;
+
     public bool CanShowOutputTypes => SelectedCategory?.Name?.Equals("Shared Output Folder") ?? false;
 
     public string NumImagesSelected =>
@@ -136,6 +139,13 @@ public partial class OutputsPageViewModel : PageViewModelBase
             settings => settings.OutputsImageSize,
             delay: TimeSpan.FromMilliseconds(250)
         );
+
+        settingsManager.RelayPropertyFor(
+            this,
+            vm => vm.ShowFolders,
+            settings => settings.IsOutputsTreeViewEnabled,
+            true
+        );
     }
 
     protected override void OnInitialLoaded()
@@ -559,7 +569,10 @@ public partial class OutputsPageViewModel : PageViewModelBase
                             pair.InstalledPackage.FullPath!,
                             pair.BasePackage.OutputFolderName
                         ),
-                        Name = pair.InstalledPackage.DisplayName ?? ""
+                        Name = pair.InstalledPackage.DisplayName ?? "",
+                        SubDirectories = GetSubfolders(
+                            Path.Combine(pair.InstalledPackage.FullPath!, pair.BasePackage.OutputFolderName)
+                        )
                     }
             )
             .ToList();
@@ -569,18 +582,34 @@ public partial class OutputsPageViewModel : PageViewModelBase
             new PackageOutputCategory
             {
                 Path = settingsManager.ImagesDirectory,
-                Name = "Shared Output Folder"
+                Name = "Shared Output Folder",
+                SubDirectories = GetSubfolders(settingsManager.ImagesDirectory)
             }
         );
 
-        packageCategories.Insert(
-            1,
-            new PackageOutputCategory { Path = settingsManager.ImagesInferenceDirectory, Name = "Inference" }
-        );
-
         Categories = new ObservableCollection<PackageOutputCategory>(packageCategories);
 
         SelectedCategory =
             Categories.FirstOrDefault(x => x.Name == previouslySelectedCategory?.Name) ?? Categories.First();
     }
+
+    private ObservableCollection<PackageOutputCategory> GetSubfolders(string strPath)
+    {
+        var subfolders = new ObservableCollection<PackageOutputCategory>();
+        var directories = Directory.EnumerateDirectories(strPath, "*", SearchOption.TopDirectoryOnly);
+
+        foreach (var dir in directories)
+        {
+            var category = new PackageOutputCategory { Name = Path.GetFileName(dir), Path = dir };
+
+            if (Directory.GetDirectories(dir, "*", SearchOption.TopDirectoryOnly).Length > 0)
+            {
+                category.SubDirectories = GetSubfolders(dir);
+            }
+
+            subfolders.Add(category);
+        }
+
+        return subfolders;
+    }
 }

StabilityMatrix.Avalonia/Views/OutputsPage.axaml

@@ -23,13 +23,29 @@
     x:DataType="vm:OutputsPageViewModel"
     Focusable="True"
     mc:Ignorable="d">
-    <Grid Margin="16" RowDefinitions="Auto,*">
-        <Grid
-            Grid.Row="0"
-            Margin="0,0,0,16"
-            ColumnDefinitions="Auto,Auto,*,Auto"
-            RowDefinitions="Auto,*">
-            
+    <Grid Margin="16" RowDefinitions="Auto,*"
+          ColumnDefinitions="Auto, *">
+
+        <TreeView Grid.Row="1"
+                  Grid.Column="0"
+                  IsVisible="{Binding ShowFolders}"
+                  Margin="0,0,12,0"
+                  ItemsSource="{Binding Categories}"
+                  SelectedItem="{Binding SelectedCategory}">
+            <TreeView.ItemTemplate>
+                <TreeDataTemplate ItemsSource="{Binding SubDirectories}">
+                    <TextBlock Text="{Binding Name}" />
+                </TreeDataTemplate>
+            </TreeView.ItemTemplate>
+        </TreeView>
+
+        <Grid Grid.Column="0"
+              Grid.ColumnSpan="2"
+              Grid.Row="0"
+              Margin="0,0,0,16"
+              ColumnDefinitions="Auto,Auto,*,Auto"
+              RowDefinitions="Auto,*">
+
             <Grid.Styles>
                 <Style Selector="TextBox">
                     <Setter Property="MinHeight" Value="40" />
@@ -38,51 +54,6 @@
                     <Setter Property="MinHeight" Value="40" />
                 </Style>
             </Grid.Styles>
-            
-            <TextBlock
-                Grid.Row="0"
-                Grid.Column="0"
-                Margin="4"
-                Text="{x:Static lang:Resources.Label_OutputFolder}" />
-            <ComboBox
-                Grid.Row="1"
-                Grid.Column="0"
-                MinWidth="150"
-                Margin="4,0"
-                VerticalAlignment="Center"
-                ItemsSource="{Binding Categories}"
-                SelectedItem="{Binding SelectedCategory}">
-                <ComboBox.Styles>
-                    <Style Selector="ComboBox /template/ ContentControl#ContentPresenter &gt; StackPanel &gt; TextBlock:nth-child(2)">
-                        <Setter Property="IsVisible" Value="False" />
-                    </Style>
-                </ComboBox.Styles>
-                <ComboBox.ItemTemplate>
-                    <DataTemplate DataType="{x:Type models1:PackageOutputCategory}">
-                        <StackPanel>
-                            <TextBlock Margin="0,4,0,4" Text="{Binding Name, Mode=OneWay}" />
-                            <TextBlock Text="{Binding Path, Mode=OneWay}" />
-                        </StackPanel>
-                    </DataTemplate>
-                </ComboBox.ItemTemplate>
-            </ComboBox>
-
-            <TextBlock
-                Grid.Row="0"
-                Grid.Column="1"
-                Margin="4"
-                IsVisible="{Binding CanShowOutputTypes}"
-                Text="{x:Static lang:Resources.Label_OutputType}" />
-            <ComboBox
-                Grid.Row="1"
-                Grid.Column="1"
-                MinWidth="150"
-                Margin="4,0"
-                VerticalAlignment="Center"
-                VerticalContentAlignment="Center"
-                IsVisible="{Binding CanShowOutputTypes}"
-                ItemsSource="{Binding OutputTypes}"
-                SelectedItem="{Binding SelectedOutputType}" />
 
             <TextBlock
                 Grid.Row="0"
@@ -104,8 +75,8 @@
                         <Button Classes="transparent-full"
                                 IsVisible="{Binding SearchQuery.Length}"
                                 Command="{Binding ClearSearchQuery}">
-                                <ui:SymbolIcon Symbol="Cancel" />
-                            </Button>
+                            <ui:SymbolIcon Symbol="Cancel" />
+                        </Button>
                         <ui:SymbolIcon
                             IsVisible="{Binding !SearchQuery.Length}"
                             Margin="0,0,10,0"
@@ -129,27 +100,31 @@
                 VerticalAlignment="Center"
                 VerticalContentAlignment="Center"
                 DefaultLabelPosition="Right">
-                
+
                 <ui:CommandBar.PrimaryCommands>
-                    <ui:CommandBarButton 
+                    <ui:CommandBarButton
                         IsEnabled="{Binding !!NumItemsSelected}"
                         Command="{Binding DeleteAllSelected}"
                         IconSource="Delete" />
                     <ui:CommandBarSeparator />
-                    <ui:CommandBarButton 
+                    <ui:CommandBarButton
                         Command="{Binding SelectAll}"
-                        IconSource="SelectAll" 
+                        IconSource="SelectAll"
                         Label="{x:Static lang:Resources.Action_SelectAll}" />
-                    <ui:CommandBarButton 
+                    <ui:CommandBarButton
                         Command="{Binding ClearSelection}"
-                        IconSource="ClearSelection" 
+                        IconSource="ClearSelection"
                         IsEnabled="{Binding !!NumItemsSelected}"
                         Label="{x:Static lang:Resources.Action_ClearSelection}" />
                     <ui:CommandBarSeparator />
-                    <ui:CommandBarButton 
-                        IconSource="Refresh" 
+                    <ui:CommandBarButton
+                        IconSource="Refresh"
                         Command="{Binding Refresh}"
                         Label="{x:Static lang:Resources.Action_Refresh}" />
+                    <ui:CommandBarToggleButton
+                        IconSource="List"
+                        IsChecked="{Binding ShowFolders}"
+                        Label="Show Folders"/>
                 </ui:CommandBar.PrimaryCommands>
 
                 <ui:CommandBar.SecondaryCommands>
@@ -161,7 +136,8 @@
             </ui:CommandBar>
         </Grid>
 
-        <scroll:BetterScrollViewer Grid.Row="1" PointerWheelChanged="ScrollViewer_MouseWheelChanged">
+        <scroll:BetterScrollViewer Grid.Column="1"
+                                   Grid.Row="1" PointerWheelChanged="ScrollViewer_MouseWheelChanged">
             <ItemsRepeater
                 x:Name="ImageRepeater"
                 VerticalAlignment="Top"
@@ -206,7 +182,8 @@
                                         IconSource="Delete"
                                         Text="{x:Static lang:Resources.Action_Delete}" />
 
-                                    <ui:MenuFlyoutSeparator IsVisible="{Binding ImageFile.GenerationParameters, Converter={x:Static ObjectConverters.IsNotNull}}" />
+                                    <ui:MenuFlyoutSeparator
+                                        IsVisible="{Binding ImageFile.GenerationParameters, Converter={x:Static ObjectConverters.IsNotNull}}" />
 
                                     <ui:MenuFlyoutSubItem
                                         IconSource="Share"

StabilityMatrix.Core/Models/Settings/Settings.cs

@@ -120,6 +120,7 @@ public class Settings
     public Size InferenceImageSize { get; set; } = new(150, 190);
     public Size OutputsImageSize { get; set; } = new(300, 300);
     public HolidayMode HolidayModeSetting { get; set; } = HolidayMode.Automatic;
+    public bool IsOutputsTreeViewEnabled { get; set; } = true;
 
     [JsonIgnore]
     public bool IsHolidayModeActive =>