Skip to content

Commit a0eefbc

Browse files
committed
Final brushing
1 parent e1d2a57 commit a0eefbc

File tree

5 files changed

+594
-492
lines changed

5 files changed

+594
-492
lines changed

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,13 @@ public AccessControlType AccessControlType
3030
}
3131
}
3232

33+
public string AccessControlTypeHumanized
34+
=> AccessControlType switch
35+
{
36+
AccessControlType.Allow => "Allow",
37+
_ => "Deny" // AccessControlType.Deny
38+
};
39+
3340
public string AccessControlTypeGlyph
3441
=> AccessControlType switch
3542
{

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1608,7 +1608,7 @@
16081608
<data name="Allow" xml:space="preserve">
16091609
<value>Allow</value>
16101610
</data>
1611-
<data name="SecurityDenyLabel.Text" xml:space="preserve">
1611+
<data name="Deny" xml:space="preserve">
16121612
<value>Deny</value>
16131613
</data>
16141614
<data name="SecurityFullControlLabel.Text" xml:space="preserve">
@@ -1680,10 +1680,10 @@
16801680
<data name="Access" xml:space="preserve">
16811681
<value>Access</value>
16821682
</data>
1683-
<data name="SecurityAdvancedAppliesToLabel.Text" xml:space="preserve">
1683+
<data name="SecurityAdvancedAppliesTo" xml:space="preserve">
16841684
<value>Applies to</value>
16851685
</data>
1686-
<data name="SecurityAdvancedPrincipal" xml:space="preserve">
1686+
<data name="Principal" xml:space="preserve">
16871687
<value>Principal</value>
16881688
</data>
16891689
<data name="SecurityAdvancedFlagsFilesLabel" xml:space="preserve">
@@ -1695,10 +1695,10 @@
16951695
<data name="SecurityAdvancedFlagsSubfoldersLabel" xml:space="preserve">
16961696
<value>subfolders</value>
16971697
</data>
1698-
<data name="SecurityAdvancedInheritedLabel.Text" xml:space="preserve">
1698+
<data name="Inherited" xml:space="preserve">
16991699
<value>Inherited</value>
17001700
</data>
1701-
<data name="SecurityAdvancedPermissionsLabel.Text" xml:space="preserve">
1701+
<data name="Permissions" xml:space="preserve">
17021702
<value>Permissions</value>
17031703
</data>
17041704
<data name="SecurityAdvancedCannotReadProperties.Text" xml:space="preserve">
@@ -2670,4 +2670,7 @@
26702670
<data name="ExitCompactOverlayDescription" xml:space="preserve">
26712671
<value>Exit compact overlay</value>
26722672
</data>
2673+
<data name="Change" xml:space="preserve">
2674+
<value>Change</value>
2675+
</data>
26732676
</root>

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

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,14 @@ public AccessControlEntry SelectedAccessControlEntry
6161
get => _selectedAccessControlEntry;
6262
set
6363
{
64+
if (_selectedAccessControlEntry is not null)
65+
_selectedAccessControlEntry.IsSelected = false;
66+
6467
if (SetProperty(ref _selectedAccessControlEntry, value))
68+
{
69+
value.IsSelected = true;
6570
RemoveAccessControlEntryCommand.NotifyCanExecuteChanged();
71+
}
6672
}
6773
}
6874

@@ -91,16 +97,32 @@ public string DisableInheritanceOption
9197
private bool _preserveInheritance;
9298

9399
private GridLength _columnType = new(64d);
94-
public GridLength ColumnType { get => _columnType; set => SetProperty(ref _columnType, value); }
100+
public GridLength ColumnType
101+
{
102+
get => _columnType;
103+
set => SetProperty(ref _columnType, value);
104+
}
95105

96106
private GridLength _columnPrincipal = new(200d);
97-
public GridLength ColumnPrincipal { get => _columnPrincipal; set => SetProperty(ref _columnPrincipal, value); }
107+
public GridLength ColumnPrincipal
108+
{
109+
get => _columnPrincipal;
110+
set => SetProperty(ref _columnPrincipal, value);
111+
}
98112

99113
private GridLength _columnAccess = new(160d);
100-
public GridLength ColumnAccess { get => _columnAccess; set => SetProperty(ref _columnAccess, value); }
114+
public GridLength ColumnAccess
115+
{
116+
get => _columnAccess;
117+
set => SetProperty(ref _columnAccess, value);
118+
}
101119

102120
private GridLength _columnInherited = new(70d);
103-
public GridLength ColumnInherited { get => _columnInherited; set => SetProperty(ref _columnInherited, value); }
121+
public GridLength ColumnInherited
122+
{
123+
get => _columnInherited;
124+
set => SetProperty(ref _columnInherited, value);
125+
}
104126

105127
public RelayCommand ChangeOwnerCommand { get; set; }
106128
public RelayCommand AddAccessControlEntryCommand { get; set; }

0 commit comments

Comments
 (0)