From 1a58812da41e227e4e8c4f4adcf593724ff69929 Mon Sep 17 00:00:00 2001
From: jeffvli <jeffvictorli@gmail.com>
Date: Mon, 25 Oct 2021 13:27:58 -0700
Subject: [PATCH] Rename 'Remove from current' to 'Remove selected'

---
 src/components/library/AlbumList.tsx     | 2 +-
 src/components/library/AlbumView.tsx     | 2 +-
 src/components/library/ArtistList.tsx    | 2 +-
 src/components/library/ArtistView.tsx    | 2 +-
 src/components/library/FolderList.tsx    | 2 +-
 src/components/library/GenreList.tsx     | 2 +-
 src/components/playlist/PlaylistList.tsx | 2 +-
 src/components/shared/ContextMenu.tsx    | 8 ++++----
 src/components/starred/StarredView.tsx   | 6 +++---
 src/redux/miscSlice.ts                   | 2 +-
 10 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/components/library/AlbumList.tsx b/src/components/library/AlbumList.tsx
index cee9dca..31a3b9d 100644
--- a/src/components/library/AlbumList.tsx
+++ b/src/components/library/AlbumList.tsx
@@ -204,7 +204,7 @@ const AlbumList = () => {
           virtualized
           disabledContextMenuOptions={[
             'moveSelectedTo',
-            'removeFromCurrent',
+            'removeSelected',
             'deletePlaylist',
             'viewInFolder',
           ]}
diff --git a/src/components/library/AlbumView.tsx b/src/components/library/AlbumView.tsx
index bb91750..2cbdc20 100644
--- a/src/components/library/AlbumView.tsx
+++ b/src/components/library/AlbumView.tsx
@@ -271,7 +271,7 @@ const AlbumView = ({ ...rest }: any) => {
         listType="music"
         isModal={rest.isModal}
         disabledContextMenuOptions={[
-          'removeFromCurrent',
+          'removeSelected',
           'moveSelectedTo',
           'deletePlaylist',
           'viewInModal',
diff --git a/src/components/library/ArtistList.tsx b/src/components/library/ArtistList.tsx
index d24043a..c3d37b9 100644
--- a/src/components/library/ArtistList.tsx
+++ b/src/components/library/ArtistList.tsx
@@ -142,7 +142,7 @@ const ArtistList = () => {
           virtualized
           disabledContextMenuOptions={[
             'moveSelectedTo',
-            'removeFromCurrent',
+            'removeSelected',
             'deletePlaylist',
             'viewInFolder',
           ]}
diff --git a/src/components/library/ArtistView.tsx b/src/components/library/ArtistView.tsx
index df8e6b6..5b7704c 100644
--- a/src/components/library/ArtistView.tsx
+++ b/src/components/library/ArtistView.tsx
@@ -284,7 +284,7 @@ const ArtistView = ({ ...rest }: any) => {
             listType="album"
             isModal={rest.isModal}
             disabledContextMenuOptions={[
-              'removeFromCurrent',
+              'removeSelected',
               'moveSelectedTo',
               'deletePlaylist',
               'viewInFolder',
diff --git a/src/components/library/FolderList.tsx b/src/components/library/FolderList.tsx
index 9580afa..097bdcd 100644
--- a/src/components/library/FolderList.tsx
+++ b/src/components/library/FolderList.tsx
@@ -227,7 +227,7 @@ const FolderList = () => {
                 'removeFromFavorites',
                 'viewInModal',
                 'moveSelectedTo',
-                'removeFromCurrent',
+                'removeSelected',
                 'deletePlaylist',
                 'viewInFolder',
               ]}
diff --git a/src/components/library/GenreList.tsx b/src/components/library/GenreList.tsx
index 243002c..371c349 100644
--- a/src/components/library/GenreList.tsx
+++ b/src/components/library/GenreList.tsx
@@ -81,7 +81,7 @@ const GenreList = () => {
             'addToQueueNext',
             'addToQueueLast',
             'moveSelectedTo',
-            'removeFromCurrent',
+            'removeSelected',
             'addToPlaylist',
             'deletePlaylist',
             'addToFavorites',
diff --git a/src/components/playlist/PlaylistList.tsx b/src/components/playlist/PlaylistList.tsx
index 6066a97..e826e38 100644
--- a/src/components/playlist/PlaylistList.tsx
+++ b/src/components/playlist/PlaylistList.tsx
@@ -178,7 +178,7 @@ const PlaylistList = () => {
             'moveSelectedTo',
             'addToFavorites',
             'removeFromFavorites',
-            'removeFromCurrent',
+            'removeSelected',
             'viewInFolder',
           ]}
         />
diff --git a/src/components/shared/ContextMenu.tsx b/src/components/shared/ContextMenu.tsx
index f753324..18618dd 100644
--- a/src/components/shared/ContextMenu.tsx
+++ b/src/components/shared/ContextMenu.tsx
@@ -227,7 +227,7 @@ export const GlobalContextMenu = () => {
     }
   };
 
-  const handleRemoveFromCurrent = async () => {
+  const handleRemoveSelected = async () => {
     if (misc.contextMenu.type === 'nowPlaying') {
       dispatch(removeFromPlayQueue({ entries: multiSelect.selected }));
       if (playQueue.currentPlayer === 1) {
@@ -549,9 +549,9 @@ export const GlobalContextMenu = () => {
             disabled={misc.contextMenu.disabledOptions.includes('addToQueueLast')}
           />
           <ContextMenuButton
-            text="Remove from current"
-            onClick={handleRemoveFromCurrent}
-            disabled={misc.contextMenu.disabledOptions.includes('removeFromCurrent')}
+            text="Remove selected"
+            onClick={handleRemoveSelected}
+            disabled={misc.contextMenu.disabledOptions.includes('removeSelected')}
           />
           <Whisper
             enterable
diff --git a/src/components/starred/StarredView.tsx b/src/components/starred/StarredView.tsx
index 9b8033e..7669e9e 100644
--- a/src/components/starred/StarredView.tsx
+++ b/src/components/starred/StarredView.tsx
@@ -175,7 +175,7 @@ const StarredView = () => {
               listType="music"
               virtualized
               disabledContextMenuOptions={[
-                'removeFromCurrent',
+                'removeSelected',
                 'moveSelectedTo',
                 'deletePlaylist',
                 'viewInModal',
@@ -201,7 +201,7 @@ const StarredView = () => {
                   listType="album"
                   virtualized
                   disabledContextMenuOptions={[
-                    'removeFromCurrent',
+                    'removeSelected',
                     'moveSelectedTo',
                     'deletePlaylist',
                   ]}
@@ -248,7 +248,7 @@ const StarredView = () => {
                   listType="artist"
                   virtualized
                   disabledContextMenuOptions={[
-                    'removeFromCurrent',
+                    'removeSelected',
                     'moveSelectedTo',
                     'addToPlaylist',
                     'deletePlaylist',
diff --git a/src/redux/miscSlice.ts b/src/redux/miscSlice.ts
index 987a5a4..67f6bfd 100644
--- a/src/redux/miscSlice.ts
+++ b/src/redux/miscSlice.ts
@@ -20,7 +20,7 @@ type ContextMenuOptions =
   | 'play'
   | 'addToQueueNext'
   | 'addToQueueLast'
-  | 'removeFromCurrent'
+  | 'removeSelected'
   | 'addToPlaylist'
   | 'deletePlaylist'
   | 'addToFavorites'