Skip to content

Commit 99e7810

Browse files
committed
refactor: rename to IgnoreAccents for better clarity
1 parent bb10b1f commit 99e7810

4 files changed

Lines changed: 22 additions & 22 deletions

File tree

Flow.Launcher.Infrastructure/StringMatcher.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ public MatchResult FuzzyMatch(string query, string stringToCompare, MatchOption
8989
var fullStringToCompareWithoutCase = opt.IgnoreCase ? stringToCompare.ToLower() : stringToCompare;
9090
var queryWithoutCase = opt.IgnoreCase ? query.ToLower() : query;
9191

92-
var fullStringToCompare = _settings.SensitiveAccents ? fullStringToCompareAndNormalize : fullStringToCompareWithoutCase;
93-
var queryToCompare = _settings.SensitiveAccents ? queryWithoutCaseAndNormalize : queryWithoutCase;
92+
var fullStringToCompare = _settings.IgnoreAccents ? fullStringToCompareAndNormalize : fullStringToCompareWithoutCase;
93+
var queryToCompare = _settings.IgnoreAccents ? queryWithoutCaseAndNormalize : queryWithoutCase;
9494

9595
var querySubstrings = queryToCompare.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
9696
int currentQuerySubstringIndex = 0;

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -359,15 +359,15 @@ public bool ShouldUsePinyin
359359
}
360360
}
361361

362-
private bool _sensitiveAccents = false;
363-
public bool SensitiveAccents
362+
private bool _IgnoreAccents = false;
363+
public bool IgnoreAccents
364364
{
365-
get => _sensitiveAccents;
365+
get => _IgnoreAccents;
366366
set
367367
{
368-
if (_sensitiveAccents != value)
368+
if (_IgnoreAccents != value)
369369
{
370-
_sensitiveAccents = value;
370+
_IgnoreAccents = value;
371371
OnPropertyChanged();
372372
}
373373
}

Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ public partial class SettingsPaneGeneralViewModel : BaseModel
2323
private readonly Portable _portable;
2424
private readonly Internationalization _translater;
2525
private readonly IPublicAPI _publicAPIInstance;
26-
private readonly bool _initialSensitiveAccents;
26+
private readonly bool _initialIgnoreAccents;
2727
public SettingsPaneGeneralViewModel(Settings settings, Updater updater, Portable portable, Internationalization translater, IPublicAPI publicApiInstance)
2828
{
2929
Settings = settings;
3030
_updater = updater;
3131
_portable = portable;
3232
_translater = translater;
3333
_publicAPIInstance = publicApiInstance;
34-
_initialSensitiveAccents = settings.SensitiveAccents;
34+
_initialIgnoreAccents = settings.IgnoreAccents;
3535
UpdateEnumDropdownLocalizations();
3636
}
3737

@@ -176,7 +176,7 @@ public bool EnableDialogJump
176176
public class DialogJumpWindowPositionData : DropdownDataGeneric<DialogJumpWindowPositions> { }
177177
public class DialogJumpResultBehaviourData : DropdownDataGeneric<DialogJumpResultBehaviours> { }
178178
public class DialogJumpFileResultBehaviourData : DropdownDataGeneric<DialogJumpFileResultBehaviours> { }
179-
public bool SensitiveAccentsRestartRequired => Settings.SensitiveAccents != _initialSensitiveAccents;
179+
public bool IgnoreAccentsRestartRequired => Settings.IgnoreAccents != _initialIgnoreAccents;
180180

181181
public List<DialogJumpWindowPositionData> DialogJumpWindowPositions { get; } =
182182
DropdownDataGeneric<DialogJumpWindowPositions>.GetValues<DialogJumpWindowPositionData>("DialogJumpWindowPosition");
@@ -201,16 +201,16 @@ public int SearchDelayTimeValue
201201
}
202202

203203

204-
public bool SensitiveAccents
204+
public bool IgnoreAccents
205205
{
206-
get => Settings.SensitiveAccents;
206+
get => Settings.IgnoreAccents;
207207
set
208208
{
209-
if(Settings.SensitiveAccents != value)
209+
if(Settings.IgnoreAccents != value)
210210
{
211-
Settings.SensitiveAccents = value;
211+
Settings.IgnoreAccents = value;
212212
OnPropertyChanged();
213-
OnPropertyChanged(nameof(SensitiveAccentsRestartRequired));
213+
OnPropertyChanged(nameof(IgnoreAccentsRestartRequired));
214214
}
215215
}
216216
}

Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,23 +92,23 @@
9292
OnContent="{DynamicResource enable}" />
9393
</ui:SettingsCard>
9494
<ui:SettingsCard
95-
Description="{DynamicResource sensitiveAccentToolTip}"
96-
Header="{DynamicResource sensitiveAccent}">
95+
Description="{DynamicResource ignoreAccents ToolTip}"
96+
Header="{DynamicResource ignoreAccents}">
9797
<ui:ToggleSwitch
98-
IsOn="{Binding SensitiveAccents}"
98+
IsOn="{Binding IgnoreAccents}"
9999
OffContent="{DynamicResource disable}"
100100
OnContent="{DynamicResource enable}" />
101101
</ui:SettingsCard>
102102
<ui:InfoBar
103-
Title="{DynamicResource sensitiveAccentRestartTitle}"
103+
Title="{DynamicResource ignoreAccentsRestartTitle}"
104104
Margin="0 4 0 0"
105105
IsClosable="False"
106106
IsOpen="True"
107-
Message="{DynamicResource sensitiveAccentRestartMessage}"
107+
Message="{DynamicResource ignoreAccentsRestartMessage}"
108108
Severity="Warning"
109-
Visibility="{Binding SensitiveAccentsRestartRequired, Converter={StaticResource BoolToVisibilityConverter}}">
109+
Visibility="{Binding IgnoreAccentsRestartRequired, Converter={StaticResource BoolToVisibilityConverter}}">
110110
<ui:InfoBar.ActionButton>
111-
<Button Command="{Binding RestartAppCommand}" Content="{DynamicResource sensitiveAccentRestartButton}" />
111+
<Button Command="{Binding RestartAppCommand}" Content="{DynamicResource ignoreAccentsRestartButton}" />
112112
</ui:InfoBar.ActionButton>
113113
</ui:InfoBar>
114114
<ui:SettingsCard

0 commit comments

Comments
 (0)