rename folder link to access link

Author: jjw24

Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml

@@ -16,7 +16,7 @@
     <system:String x:Key="plugin_explorer_edit">Edit</system:String>
     <system:String x:Key="plugin_explorer_add">Add</system:String>
     <system:String x:Key="plugin_explorer_manageactionkeywords_header">Customise Action Keywords</system:String>
-    <system:String x:Key="plugin_explorer_quickaccesslinks_header">Quick Access Link Paths</system:String>
+    <system:String x:Key="plugin_explorer_quickaccesslinks_header">Quick Access Links</system:String>
     <system:String x:Key="plugin_explorer_indexsearchexcludedpaths_header">Index Search Excluded Paths</system:String>
     <system:String x:Key="plugin_explorer_manageindexoptions">Indexing Options</system:String>
     <system:String x:Key="plugin_explorer_actionkeywordview_search">Search Activation:</system:String>

Plugins/Flow.Launcher.Plugin.Explorer/Search/QuickAccessLinks/QuickAccess.cs

@@ -13,38 +13,38 @@ public QuickAccess(PluginInitContext context)
             resultManager = new ResultManager(context);
         }
 
-        internal List<Result> AccessLinkListMatched(Query query, List<AccessLink> folderLinks)
+        internal List<Result> AccessLinkListMatched(Query query, List<AccessLink> accessLinks)
         {
             if (string.IsNullOrEmpty(query.Search))
                 return new List<Result>();
 
             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))
                     .OrderBy(x => x.Title))
                 .ToList();
         }
 
-        internal List<Result> AccessLinkListAll(Query query, List<AccessLink> folderLinks)
-            => folderLinks
+        internal List<Result> AccessLinkListAll(Query query, List<AccessLink> 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))

Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs

@@ -32,9 +32,9 @@ public void Save()
             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()
         {

Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs

@@ -170,10 +170,10 @@ private void btnDelete_Click(object sender, RoutedEventArgs e)
                 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 @@ private void btnAdd_Click(object sender, RoutedEventArgs e)
             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,32 +264,32 @@ private void lbxAccessLinks_Drop(object sender, DragEventArgs e)
                             Path = s
                         };
 
-                        AddFolderLink(newFolderLink);
+                        AddAccessLink(newFolderLink);
                     }
 
                     RefreshView();
                 }
             }
         }
 
-        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<AccessLink>();
 
-                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<AccessLink>();
 
-                viewModel.Settings.IndexSearchExcludedSubdirectoryPaths.Add(newFolderLink);
+                viewModel.Settings.IndexSearchExcludedSubdirectoryPaths.Add(newAccessLink);
             }
         }