diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml index a30b8e54f..fe79e3140 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml @@ -16,7 +16,7 @@ Edit Add Customise Action Keywords - Quick Access Link Paths + Quick Access Links Index Search Excluded Paths Indexing Options Search Activation: diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/QuickAccessLinks/QuickAccess.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/QuickAccessLinks/QuickAccess.cs index 03313c6df..d4f4dadbe 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/QuickAccessLinks/QuickAccess.cs +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/QuickAccessLinks/QuickAccess.cs @@ -13,23 +13,23 @@ namespace Flow.Launcher.Plugin.Explorer.Search.QuickAccessLinks resultManager = new ResultManager(context); } - internal List AccessLinkListMatched(Query query, List folderLinks) + internal List AccessLinkListMatched(Query query, List accessLinks) { if (string.IsNullOrEmpty(query.Search)) return new List(); string search = query.Search.ToLower(); - var queriedFolderLinks = - folderLinks.Where(x => x.Nickname.StartsWith(search, StringComparison.OrdinalIgnoreCase)); + var queriedAccessLinks = + accessLinks.Where(x => x.Nickname.StartsWith(search, StringComparison.OrdinalIgnoreCase)); - return queriedFolderLinks + return queriedAccessLinks .Where(x => x.Type == ResultType.Folder) .Select(item => resultManager.CreateFolderResult(item.Nickname, item.Path, item.Path, query)) .OrderBy(x => x.Title) .Concat( - queriedFolderLinks + queriedAccessLinks .Where(x => x.Type == ResultType.File) .Select(item => resultManager.CreateFileResult(item.Path, query)) @@ -37,14 +37,14 @@ namespace Flow.Launcher.Plugin.Explorer.Search.QuickAccessLinks .ToList(); } - internal List AccessLinkListAll(Query query, List folderLinks) - => folderLinks + internal List AccessLinkListAll(Query query, List accessLinks) + => accessLinks .Where(x => x.Type == ResultType.Folder) .Select(item => resultManager.CreateFolderResult(item.Nickname, item.Path, item.Path, query)) .OrderBy(x => x.Title) .Concat( - folderLinks + accessLinks .Where(x => x.Type == ResultType.File) .Select(item => resultManager.CreateFileResult(item.Path, query)) diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs b/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs index c368b7071..791c06b66 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs +++ b/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs @@ -32,9 +32,9 @@ namespace Flow.Launcher.Plugin.Explorer.ViewModels storage.Save(); } - internal void RemoveFolderLinkFromQuickFolders(AccessLink selectedRow) => Settings.QuickAccessLinks.Remove(selectedRow); + internal void RemoveLinkFromQuickAccess(AccessLink selectedRow) => Settings.QuickAccessLinks.Remove(selectedRow); - internal void RemoveFolderLinkFromExcludedIndexPaths(AccessLink selectedRow) => Settings.IndexSearchExcludedSubdirectoryPaths.Remove(selectedRow); + internal void RemoveAccessLinkFromExcludedIndexPaths(AccessLink selectedRow) => Settings.IndexSearchExcludedSubdirectoryPaths.Remove(selectedRow); internal void OpenWindowsIndexingOptions() { diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs index 7afeb1207..5d2980c55 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs @@ -170,10 +170,10 @@ namespace Flow.Launcher.Plugin.Explorer.Views if (MessageBox.Show(msg, string.Empty, MessageBoxButton.YesNo) == MessageBoxResult.Yes) { if (expAccessLinks.IsExpanded) - viewModel.RemoveFolderLinkFromQuickFolders(selectedRow); + viewModel.RemoveLinkFromQuickAccess(selectedRow); if (expExcludedPaths.IsExpanded) - viewModel.RemoveFolderLinkFromExcludedIndexPaths(selectedRow); + viewModel.RemoveAccessLinkFromExcludedIndexPaths(selectedRow); RefreshView(); } @@ -235,12 +235,12 @@ namespace Flow.Launcher.Plugin.Explorer.Views var folderBrowserDialog = new FolderBrowserDialog(); if (folderBrowserDialog.ShowDialog() == DialogResult.OK) { - var newFolderLink = new AccessLink + var newAccessLink = new AccessLink { Path = folderBrowserDialog.SelectedPath }; - AddFolderLink(newFolderLink); + AddAccessLink(newAccessLink); } RefreshView(); @@ -264,7 +264,7 @@ namespace Flow.Launcher.Plugin.Explorer.Views Path = s }; - AddFolderLink(newFolderLink); + AddAccessLink(newFolderLink); } RefreshView(); @@ -272,24 +272,24 @@ namespace Flow.Launcher.Plugin.Explorer.Views } } - private void AddFolderLink(AccessLink newFolderLink) + private void AddAccessLink(AccessLink newAccessLink) { if (expAccessLinks.IsExpanded - && !viewModel.Settings.QuickAccessLinks.Any(x => x.Path == newFolderLink.Path)) + && !viewModel.Settings.QuickAccessLinks.Any(x => x.Path == newAccessLink.Path)) { if (viewModel.Settings.QuickAccessLinks == null) viewModel.Settings.QuickAccessLinks = new List(); - viewModel.Settings.QuickAccessLinks.Add(newFolderLink); + viewModel.Settings.QuickAccessLinks.Add(newAccessLink); } if (expExcludedPaths.IsExpanded - && !viewModel.Settings.IndexSearchExcludedSubdirectoryPaths.Any(x => x.Path == newFolderLink.Path)) + && !viewModel.Settings.IndexSearchExcludedSubdirectoryPaths.Any(x => x.Path == newAccessLink.Path)) { if (viewModel.Settings.IndexSearchExcludedSubdirectoryPaths == null) viewModel.Settings.IndexSearchExcludedSubdirectoryPaths = new List(); - viewModel.Settings.IndexSearchExcludedSubdirectoryPaths.Add(newFolderLink); + viewModel.Settings.IndexSearchExcludedSubdirectoryPaths.Add(newAccessLink); } }