Skip to content

Commit 02db1fd

Browse files
committed
Rename setting
1 parent ce68d1d commit 02db1fd

File tree

6 files changed

+21
-21
lines changed

6 files changed

+21
-21
lines changed

src/Files.App/Data/Contracts/IFoldersSettingsService.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ public interface IFoldersSettingsService : IBaseSettingsService, INotifyProperty
9191
SizeUnitTypes SizeUnitFormat { get; set; }
9292

9393
/// <summary>
94-
/// Gets or sets a value indicating which action to take when typing characters.
94+
/// Gets or sets a value indicating the keyboard typing behavior.
9595
/// </summary>
96-
KeyboardTypingAction KeyboardTypingAction { get; set; }
96+
KeyboardTypingBehavior KeyboardTypingBehavior { get; set; }
9797
}
9898
}

src/Files.App/Data/Enums/KeyboardTypingAction.cs renamed to src/Files.App/Data/Enums/KeyboardTypingBehavior.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace Files.App.Data.Enums
55
{
6-
public enum KeyboardTypingAction
6+
public enum KeyboardTypingBehavior
77
{
88
/// <summary>
99
/// Jump to matching item.

src/Files.App/Services/Settings/FoldersSettingsService.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,9 @@ public SizeUnitTypes SizeUnitFormat
115115
}
116116

117117
/// <inheritdoc/>
118-
public KeyboardTypingAction KeyboardTypingAction
118+
public KeyboardTypingBehavior KeyboardTypingBehavior
119119
{
120-
get => (KeyboardTypingAction)Get((long)KeyboardTypingAction.JumpToFile);
120+
get => (KeyboardTypingBehavior)Get((long)KeyboardTypingBehavior.JumpToFile);
121121
set => Set((long)value);
122122
}
123123

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4273,7 +4273,7 @@
42734273
<data name="Filename" xml:space="preserve">
42744274
<value>Filename</value>
42754275
</data>
4276-
<data name="TypeToAction" xml:space="preserve">
4276+
<data name="KeyboardTypingBehavior" xml:space="preserve">
42774277
<value>Behavior when typing in the file area</value>
42784278
</data>
42794279
<data name="JumpToFile" xml:space="preserve">

src/Files.App/ViewModels/Settings/FoldersViewModel.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public sealed partial class FoldersViewModel : ObservableObject
99

1010

1111
public Dictionary<SizeUnitTypes, string> SizeUnitsOptions { get; private set; } = [];
12-
public Dictionary<KeyboardTypingAction, string> KeyboardTypingActions { get; private set; } = [];
12+
public Dictionary<KeyboardTypingBehavior, string> KeyboardTypingBehaviors { get; private set; } = [];
1313

1414
public FoldersViewModel()
1515
{
@@ -20,10 +20,10 @@ public FoldersViewModel()
2020
SizeUnitsOptions.Add(SizeUnitTypes.DecimalUnits, Strings.Decimal.GetLocalizedResource());
2121
SizeUnitFormat = SizeUnitsOptions[UserSettingsService.FoldersSettingsService.SizeUnitFormat];
2222

23-
// Size unit format
24-
KeyboardTypingActions.Add(Data.Enums.KeyboardTypingAction.JumpToFile, Strings.JumpToFile.GetLocalizedResource());
25-
KeyboardTypingActions.Add(Data.Enums.KeyboardTypingAction.FilterItems, Strings.FilterItems.GetLocalizedResource());
26-
KeyboardTypingAction = KeyboardTypingActions[UserSettingsService.FoldersSettingsService.KeyboardTypingAction];
23+
// Keyboard typing behavior
24+
KeyboardTypingBehaviors.Add(Data.Enums.KeyboardTypingBehavior.JumpToFile, Strings.JumpToFile.GetLocalizedResource());
25+
KeyboardTypingBehaviors.Add(Data.Enums.KeyboardTypingBehavior.FilterItems, Strings.FilterItems.GetLocalizedResource());
26+
KeyboardTypingBehavior = KeyboardTypingBehaviors[UserSettingsService.FoldersSettingsService.KeyboardTypingBehavior];
2727
}
2828

2929
// Properties
@@ -281,15 +281,15 @@ public string SizeUnitFormat
281281
}
282282
}
283283

284-
private string keyboardTypingAction;
285-
public string KeyboardTypingAction
284+
private string keyboardTypingBehavior;
285+
public string KeyboardTypingBehavior
286286
{
287-
get => keyboardTypingAction;
287+
get => keyboardTypingBehavior;
288288
set
289289
{
290-
if (SetProperty(ref keyboardTypingAction, value))
290+
if (SetProperty(ref keyboardTypingBehavior, value))
291291
{
292-
UserSettingsService.FoldersSettingsService.KeyboardTypingAction = KeyboardTypingActions.First(e => e.Value == value).Key;
292+
UserSettingsService.FoldersSettingsService.KeyboardTypingBehavior = KeyboardTypingBehaviors.First(e => e.Value == value).Key;
293293
}
294294
}
295295
}

src/Files.App/Views/Settings/FoldersPage.xaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,16 +178,16 @@
178178
SelectedItem="{x:Bind ViewModel.SizeUnitFormat, Mode=TwoWay}" />
179179
</wctcontrols:SettingsCard>
180180

181-
<!-- Typing behavior -->
182-
<wctcontrols:SettingsCard Header="{helpers:ResourceString Name=TypeToAction}">
181+
<!-- Keyboard typing behavior -->
182+
<wctcontrols:SettingsCard Header="{helpers:ResourceString Name=KeyboardTypingBehavior}">
183183
<wctcontrols:SettingsCard.HeaderIcon>
184184
<FontIcon Glyph="&#xE765;" />
185185
</wctcontrols:SettingsCard.HeaderIcon>
186186

187187
<uc:ComboBoxEx
188-
AutomationProperties.Name="{helpers:ResourceString Name=TypeToAction}"
189-
ItemsSource="{x:Bind ViewModel.KeyboardTypingActions.Values}"
190-
SelectedItem="{x:Bind ViewModel.KeyboardTypingAction, Mode=TwoWay}" />
188+
AutomationProperties.Name="{helpers:ResourceString Name=KeyboardTypingBehavior}"
189+
ItemsSource="{x:Bind ViewModel.KeyboardTypingBehaviors.Values}"
190+
SelectedItem="{x:Bind ViewModel.KeyboardTypingBehavior, Mode=TwoWay}" />
191191
</wctcontrols:SettingsCard>
192192

193193
<!-- Calculate folder sizes -->

0 commit comments

Comments
 (0)