Fix: Fix UI in Security pages

Author: 0x5bfa

src/Files.App/Filesystem/Security/AccessControlEntry.cs

@@ -33,7 +33,7 @@ public AccessControlType AccessControlType
 		public string AccessControlTypeGlyph
 			=> AccessControlType switch
 			{
-				AccessControlType.Allow => "\xF13E",
+				AccessControlType.Allow => "\xE73E",
 				_ => "\xF140" // AccessControlType.Deny
 			};
 

src/Files.App/Filesystem/Security/Principal.cs

@@ -1,5 +1,4 @@
 using CommunityToolkit.Mvvm.ComponentModel;
-using Files.App.Extensions;
 using System.Collections.Generic;
 using System.Text;
 using static Vanara.PInvoke.AdvApi32;
@@ -25,11 +24,14 @@ public string Glyph
 
 		public string? Name { get; set; }
 
-		public string DisplayName
-			=> string.IsNullOrEmpty(Name) ? "SecurityUnknownAccount".GetLocalizedResource() : Name;
+		public string? DisplayName
+			=> string.IsNullOrEmpty(Name) ? Sid : Name;
 
-		public string FullNameOrSid
-			=> string.IsNullOrEmpty(Name) ? Sid : string.IsNullOrEmpty(Domain) ? Name : $"{Domain}\\{Name}";
+		public string? FullNameOrSid
+			=> string.IsNullOrEmpty(Domain) ? Sid : $"{Domain}\\{Name}";
+
+		public string? FullNameHumanized
+			=> string.IsNullOrEmpty(Domain) ? string.Empty : $"({Domain}\\{Name})";
 
 		public List<string> Groups { get; set; }
 

src/Files.App/Strings/en-US/Resources.resw

@@ -1642,7 +1642,7 @@
     <value>You do not have permissions to view the security properties of this object. Click "Advanced permissions" to proceed.</value>
   </data>
   <data name="SecurityOwnerLabel.Text" xml:space="preserve">
-    <value>Owner</value>
+    <value>Owner:</value>
   </data>
   <data name="SecurityUnknownOwnerText.Text" xml:space="preserve">
     <value>Unknown owner</value>
@@ -1683,8 +1683,8 @@
   <data name="SecurityAdvancedAppliesToLabel.Text" xml:space="preserve">
     <value>Applies to</value>
   </data>
-  <data name="SecurityAdvancedEntityLabel.Text" xml:space="preserve">
-    <value>Entity</value>
+  <data name="SecurityAdvancedPrincipal" xml:space="preserve">
+    <value>Principal</value>
   </data>
   <data name="SecurityAdvancedFlagsFilesLabel" xml:space="preserve">
     <value>files</value>

src/Files.App/ViewModels/Properties/SecurityViewModel.cs

@@ -5,8 +5,7 @@
 using Files.App.Filesystem;
 using Files.App.Filesystem.Security;
 using Files.App.Helpers;
-using System.Collections.Generic;
-using System.Linq;
+using Microsoft.UI.Xaml;
 using System.Threading.Tasks;
 using Windows.Storage;
 
@@ -91,6 +90,18 @@ public string DisableInheritanceOption
 
 		private bool _preserveInheritance;
 
+		private GridLength _columnType = new(64d);
+		public GridLength ColumnType { get => _columnType; set => SetProperty(ref _columnType, value); }
+
+		private GridLength _columnPrincipal = new(200d);
+		public GridLength ColumnPrincipal { get => _columnPrincipal; set => SetProperty(ref _columnPrincipal, value); }
+
+		private GridLength _columnAccess = new(160d);
+		public GridLength ColumnAccess { get => _columnAccess; set => SetProperty(ref _columnAccess, value); }
+
+		private GridLength _columnInherited = new(70d);
+		public GridLength ColumnInherited { get => _columnInherited; set => SetProperty(ref _columnInherited, value); }
+
 		public RelayCommand ChangeOwnerCommand { get; set; }
 		public RelayCommand AddAccessControlEntryCommand { get; set; }
 		public RelayCommand RemoveAccessControlEntryCommand { get; set; }