Feature: Added "Properties" button to the Details Pane (#12913)

files-community · Jul 10, 2023 · a5d3844 · a5d3844
1 parent e1f43cc
commit a5d3844
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/src/Files.App/UserControls/Pane/PreviewPane.xaml b/src/Files.App/UserControls/Pane/PreviewPane.xaml
@@ -9,6 +9,7 @@
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	xmlns:properties="using:Files.App.ViewModels.Properties"
 	xmlns:triggers="using:CommunityToolkit.WinUI.UI.Triggers"
+	xmlns:usercontrols="using:Files.App.UserControls"
 	x:Name="Root"
 	MinWidth="90"
 	HorizontalAlignment="Stretch"
@@ -267,6 +268,22 @@
 						</DataTemplate>
 					</ItemsControl.ItemTemplate>
 				</ItemsControl>
+
+				<!--  Open Properties Button  -->
+				<Button
+					x:Name="DetailsOpenProperties"
+					Margin="8,0,8,8"
+					HorizontalAlignment="Left"
+					Command="{x:Bind Commands.OpenProperties}"
+					IsEnabled="{x:Bind Commands.OpenProperties.IsExecutable, Mode=OneWay}"
+					ToolTipService.ToolTip="{x:Bind Commands.OpenProperties.LabelWithHotKey, Mode=OneWay}">
+					<Button.Content>
+						<StackPanel Orientation="Horizontal" Spacing="8">
+							<usercontrols:OpacityIcon Style="{x:Bind Commands.OpenProperties.OpacityStyle}" />
+							<TextBlock Text="{helpers:ResourceString Name=Properties}" />
+						</StackPanel>
+					</Button.Content>
+				</Button>
 			</StackPanel>
 		</ScrollViewer>
 

diff --git a/src/Files.App/UserControls/Pane/PreviewPane.xaml.cs b/src/Files.App/UserControls/Pane/PreviewPane.xaml.cs
@@ -1,11 +1,6 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.DependencyInjection;
-using Files.App.Extensions;
-using Files.App.ViewModels;
-using Files.Core.Services.Settings;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
@@ -25,6 +20,8 @@ public sealed partial class PreviewPane : UserControl
 
 		private readonly IPreviewPaneSettingsService PaneSettingsService;
 
+		private readonly ICommandManager Commands;
+
 		private readonly PreviewPaneViewModel ViewModel;
 
 		private ObservableContext Context { get; } = new();
@@ -33,6 +30,7 @@ public PreviewPane()
 		{
 			InitializeComponent();
 			PaneSettingsService = Ioc.Default.GetRequiredService<IPreviewPaneSettingsService>();
+			Commands = Ioc.Default.GetRequiredService<ICommandManager>();
 			ViewModel = Ioc.Default.GetRequiredService<PreviewPaneViewModel>();
 		}
 

diff --git a/src/Files.App/ViewModels/Previews/FolderPreviewViewModel.cs b/src/Files.App/ViewModels/Previews/FolderPreviewViewModel.cs
@@ -65,7 +65,8 @@ private async Task LoadPreviewAndDetailsAsync()
 			}
 
 			var tags = Item.FileTagsUI is not null ? string.Join(',', Item.FileTagsUI.Select(x => x.Name)) : null;
-			Item.FileDetails.Add(GetFileProperty("FileTags", tags));
+			if (tags is not null)
+				Item.FileDetails.Add(GetFileProperty("FileTags", tags));
 		}
 
 		private static FileProperty GetFileProperty(string nameResource, object value)