Skip to content

Commit 38729ea

Browse files
Update names
1 parent 157a817 commit 38729ea

File tree

5 files changed

+42
-42
lines changed

5 files changed

+42
-42
lines changed

src/Files.App/Data/Models/SelectedItemsPropertiesViewModel.cs

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -561,15 +561,15 @@ public string ShortcutItemPath
561561
set
562562
{
563563
SetProperty(ref shortcutItemPath, value);
564-
ShortcutItemPathUserEditableValue = value;
564+
ShortcutItemPathEditedValue = value;
565565
}
566566
}
567567

568-
private string shortcutItemPathUserEditableValue;
569-
public string ShortcutItemPathUserEditableValue
568+
private string shortcutItemPathEditedValue;
569+
public string ShortcutItemPathEditedValue
570570
{
571-
get => shortcutItemPathUserEditableValue;
572-
set => SetProperty(ref shortcutItemPathUserEditableValue, value);
571+
get => shortcutItemPathEditedValue;
572+
set => SetProperty(ref shortcutItemPathEditedValue, value);
573573
}
574574

575575
private bool isShortcutItemPathReadOnly;
@@ -586,15 +586,15 @@ public string ShortcutItemWorkingDir
586586
set
587587
{
588588
SetProperty(ref shortcutItemWorkingDir, value);
589-
ShortcutItemWorkingDirUserEditableValue = value;
589+
ShortcutItemWorkingDirEditedValue = value;
590590
}
591591
}
592592

593-
private string shortcutItemWorkingDirUserEditableValue;
594-
public string ShortcutItemWorkingDirUserEditableValue
593+
private string shortcutItemWorkingDirEditedValue;
594+
public string ShortcutItemWorkingDirEditedValue
595595
{
596-
get => shortcutItemWorkingDirUserEditableValue;
597-
set => SetProperty(ref shortcutItemWorkingDirUserEditableValue, value);
596+
get => shortcutItemWorkingDirEditedValue;
597+
set => SetProperty(ref shortcutItemWorkingDirEditedValue, value);
598598
}
599599

600600
private bool shortcutItemWorkingDirVisibility = false;
@@ -611,17 +611,17 @@ public string ShortcutItemArguments
611611
set
612612
{
613613
SetProperty(ref shortcutItemArguments, value);
614-
ShortcutItemArgumentsUserEditableValue = value;
614+
ShortcutItemArgumentsEditedValue = value;
615615
}
616616
}
617617

618-
private string shortcutItemArgumentsUserEditableValue;
619-
public string ShortcutItemArgumentsUserEditableValue
618+
private string shortcutItemArgumentsEditedValue;
619+
public string ShortcutItemArgumentsEditedValue
620620
{
621-
get => shortcutItemArgumentsUserEditableValue;
621+
get => shortcutItemArgumentsEditedValue;
622622
set
623623
{
624-
SetProperty(ref shortcutItemArgumentsUserEditableValue, value);
624+
SetProperty(ref shortcutItemArgumentsEditedValue, value);
625625
}
626626
}
627627

@@ -681,18 +681,18 @@ public bool IsReadOnly
681681
{
682682
IsReadOnlyEnabled = true;
683683
SetProperty(ref isReadOnly, value);
684-
IsReadOnlyUserEditableValue = value;
684+
IsReadOnlyEditedValue = value;
685685
}
686686
}
687687

688-
private bool isReadOnlyUserEditableValue;
689-
public bool IsReadOnlyUserEditableValue
688+
private bool isReadOnlyEditedValue;
689+
public bool IsReadOnlyEditedValue
690690
{
691-
get => isReadOnlyUserEditableValue;
691+
get => isReadOnlyEditedValue;
692692
set
693693
{
694694
IsReadOnlyEnabled = true;
695-
SetProperty(ref isReadOnlyUserEditableValue, value);
695+
SetProperty(ref isReadOnlyEditedValue, value);
696696
}
697697
}
698698

@@ -710,15 +710,15 @@ public bool IsHidden
710710
set
711711
{
712712
SetProperty(ref isHidden, value);
713-
IsHiddenUserEditableValue = value;
713+
IsHiddenEditedValue = value;
714714
}
715715
}
716716

717-
private bool isHiddenUserEditableValue;
718-
public bool IsHiddenUserEditableValue
717+
private bool isHiddenEditedValue;
718+
public bool IsHiddenEditedValue
719719
{
720-
get => isHiddenUserEditableValue;
721-
set => SetProperty(ref isHiddenUserEditableValue, value);
720+
get => isHiddenEditedValue;
721+
set => SetProperty(ref isHiddenEditedValue, value);
722722
}
723723

724724
private bool runAsAdmin;
@@ -729,18 +729,18 @@ public bool RunAsAdmin
729729
{
730730
RunAsAdminEnabled = true;
731731
SetProperty(ref runAsAdmin, value);
732-
RunAsAdminUserEditableValue = value;
732+
RunAsAdminEditedValue = value;
733733
}
734734
}
735735

736-
private bool runAsAdminUserEditableValue;
737-
public bool RunAsAdminUserEditableValue
736+
private bool runAsAdminEditedValue;
737+
public bool RunAsAdminEditedValue
738738
{
739-
get => runAsAdminUserEditableValue;
739+
get => runAsAdminEditedValue;
740740
set
741741
{
742742
RunAsAdminEnabled = true;
743-
SetProperty(ref runAsAdminUserEditableValue, value);
743+
SetProperty(ref runAsAdminEditedValue, value);
744744
}
745745
}
746746

src/Files.App/Views/Properties/GeneralPage.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,7 @@
704704
HorizontalAlignment="Right"
705705
VerticalAlignment="Center"
706706
AutomationProperties.Name="{helpers:ResourceString Name=ReadOnly}"
707-
IsChecked="{x:Bind ViewModel.IsReadOnlyUserEditableValue, Mode=TwoWay}"
707+
IsChecked="{x:Bind ViewModel.IsReadOnlyEditedValue, Mode=TwoWay}"
708708
IsEnabled="{x:Bind ViewModel.IsReadOnlyEnabled, Mode=OneWay}" />
709709

710710
<!-- (Divider) -->
@@ -731,7 +731,7 @@
731731
HorizontalAlignment="Right"
732732
VerticalAlignment="Center"
733733
AutomationProperties.Name="{helpers:ResourceString Name=Hidden}"
734-
IsChecked="{x:Bind ViewModel.IsHiddenUserEditableValue, Mode=TwoWay}" />
734+
IsChecked="{x:Bind ViewModel.IsHiddenEditedValue, Mode=TwoWay}" />
735735

736736
</Grid>
737737
</Expander.Content>

src/Files.App/Views/Properties/GeneralPage.xaml.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,8 @@ await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(() =>
173173
});
174174
}
175175

176-
ViewModel.IsReadOnly = ViewModel.IsReadOnlyUserEditableValue;
177-
ViewModel.IsHidden = ViewModel.IsHiddenUserEditableValue;
176+
ViewModel.IsReadOnly = ViewModel.IsReadOnlyEditedValue;
177+
ViewModel.IsHidden = ViewModel.IsHiddenEditedValue;
178178

179179
if (!GetNewName(out var newName))
180180
return true;

src/Files.App/Views/Properties/ShortcutPage.xaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
Grid.Column="1"
7676
VerticalAlignment="Center"
7777
IsReadOnly="{x:Bind ViewModel.IsShortcutItemPathReadOnly, Mode=OneWay}"
78-
Text="{x:Bind ViewModel.ShortcutItemPathUserEditableValue, Mode=TwoWay}"
78+
Text="{x:Bind ViewModel.ShortcutItemPathEditedValue, Mode=TwoWay}"
7979
Visibility="Visible" />
8080
</Grid>
8181

@@ -117,7 +117,7 @@
117117
Grid.Column="1"
118118
VerticalAlignment="Center"
119119
x:Load="{x:Bind ViewModel.ShortcutItemArgumentsVisibility, Mode=OneWay}"
120-
Text="{x:Bind ViewModel.ShortcutItemArgumentsUserEditableValue, Mode=TwoWay}" />
120+
Text="{x:Bind ViewModel.ShortcutItemArgumentsEditedValue, Mode=TwoWay}" />
121121

122122
<TextBlock
123123
x:Name="PropertiesShortcutItemWorkingDir"
@@ -134,7 +134,7 @@
134134
Grid.Column="1"
135135
VerticalAlignment="Center"
136136
x:Load="{x:Bind ViewModel.ShortcutItemWorkingDirVisibility, Mode=OneWay}"
137-
Text="{x:Bind ViewModel.ShortcutItemWorkingDirUserEditableValue, Mode=TwoWay}" />
137+
Text="{x:Bind ViewModel.ShortcutItemWorkingDirEditedValue, Mode=TwoWay}" />
138138
</Grid>
139139

140140
<settingsuc:SettingsBlockControl
@@ -144,7 +144,7 @@
144144
x:Load="{x:Bind ViewModel.RunAsAdminEnabled, Mode=OneWay}">
145145
<ToggleSwitch
146146
AutomationProperties.Name="{helpers:ResourceString Name=RunAsAdministrator}"
147-
IsOn="{x:Bind ViewModel.RunAsAdminUserEditableValue, Mode=TwoWay}"
147+
IsOn="{x:Bind ViewModel.RunAsAdminEditedValue, Mode=TwoWay}"
148148
Style="{StaticResource RightAlignedToggleSwitchStyle}" />
149149
</settingsuc:SettingsBlockControl>
150150

src/Files.App/Views/Properties/ShortcutPage.xaml.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ public override async Task<bool> SaveChangesAsync()
2424
if (shortcutItem is null)
2525
return true;
2626

27-
ViewModel.RunAsAdmin = ViewModel.RunAsAdminUserEditableValue;
28-
ViewModel.ShortcutItemPath = ViewModel.ShortcutItemPathUserEditableValue;
29-
ViewModel.ShortcutItemWorkingDir = ViewModel.ShortcutItemWorkingDirUserEditableValue;
30-
ViewModel.ShortcutItemArguments = ViewModel.ShortcutItemArgumentsUserEditableValue;
27+
ViewModel.RunAsAdmin = ViewModel.RunAsAdminEditedValue;
28+
ViewModel.ShortcutItemPath = ViewModel.ShortcutItemPathEditedValue;
29+
ViewModel.ShortcutItemWorkingDir = ViewModel.ShortcutItemWorkingDirEditedValue;
30+
ViewModel.ShortcutItemArguments = ViewModel.ShortcutItemArgumentsEditedValue;
3131

3232
await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(() =>
3333
UIFilesystemHelpers.UpdateShortcutItemProperties(shortcutItem,

0 commit comments

Comments
 (0)