Cleaned up some strings related to the category context menu.

src/musikbox/app/overlay/PlayQueueOverlays.cpp

@@ -315,7 +315,7 @@ static void handleJumpTo(
 static void showAddCategorySelectionToPlaylistOverlay(
     IMessageQueue& queue,
     ILibraryPtr library,
-    const std::string& categoryType, 
+    const std::string& categoryType,
     int64_t categoryId)
 {
     std::shared_ptr<CategoryListQuery> query = queryPlaylists(library);
@@ -445,19 +445,20 @@ void PlayQueueOverlays::ShowAddCategoryOverlay(
     PlaybackService& playback,
     ILibraryPtr library,
     const std::string& fieldColumn,
+    const std::string& fieldValue,
     int64_t fieldId)
 {
     std::shared_ptr<Adapter> adapter(new Adapter());
     adapter->AddEntry(_TSTR("playqueue_overlay_add_to_playlist"));
-    adapter->AddEntry(_TSTR("playqueue_overlay_add_to_start"));
-    adapter->AddEntry(_TSTR("playqueue_overlay_add_to_end"));
-    adapter->AddEntry(_TSTR("playqueue_overlay_add_as_next"));
+    adapter->AddEntry(_TSTR("playqueue_overlay_add_to_start_of_queue"));
+    adapter->AddEntry(_TSTR("playqueue_overlay_add_to_end_in_queue"));
+    adapter->AddEntry(_TSTR("playqueue_overlay_add_as_next_in_queue"));
     adapter->SetSelectable(true);
 
     std::shared_ptr<ListOverlay> dialog(new ListOverlay());
 
     dialog->SetAdapter(adapter)
-        .SetTitle(_TSTR("playqueue_overlay_add_to_queue_title"))
+        .SetTitle(_TSTR("playqueue_overlay_add_category_title"))
         .SetWidth(_DIMEN("playqueue_playlist_add_to_queue_overlay", DEFAULT_OVERLAY_WIDTH))
         .SetSelectedIndex(0)
         .SetItemSelectedCallback(
@@ -567,8 +568,8 @@ void PlayQueueOverlays::ShowLoadPlaylistOverlay(
 
 void PlayQueueOverlays::ShowSavePlaylistOverlay(
     IMessageQueue& queue,
-    PlaybackService& playback, 
-    ILibraryPtr library, 
+    PlaybackService& playback,
+    ILibraryPtr library,
     int64_t selectedPlaylistId)
 {
     std::shared_ptr<CategoryListQuery> query = queryPlaylists(library);

src/musikbox/app/overlay/PlayQueueOverlays.h

@@ -57,6 +57,7 @@ namespace musik {
                     musik::core::audio::PlaybackService& playback,
                     musik::core::ILibraryPtr library,
                     const std::string& fieldColumn,
+                    const std::string& fieldValue,
                     int64_t fieldId);
 
                 static void ShowAlbumDividerOverlay(

src/musikbox/app/window/CategoryListView.cpp

@@ -204,6 +204,7 @@ bool CategoryListView::KeyPress(const std::string& key) {
                 this->playback,
                 this->library,
                 this->fieldName,
+                this->GetSelectedValue(),
                 id);
             return true;
         }

src/musikbox/data/locales/en_US.json

@@ -73,12 +73,9 @@
 
         "playqueue_title": "play queue",
 
-        "playqueue_overlay_add_to_start": "add to beginning",
-        "playqueue_overlay_add_to_end": "add to end",
-        "playqueue_overlay_add_as_next": "add as next",
         "playqueue_overlay_new": "new...",
         "playqueue_overlay_confirm_overwrite_message": "are you sure you want to overwrite the playlist '%s'?",
-        "playqueue_overlay_add_to_queue_title": "add to play queue",
+        "playqueue_overlay_add_category_title": "category actions",
         "playqueue_overlay_load_playlist_title": "load playlist",
         "playqueue_overlay_save_playlist_title": "save playlist",
         "playqueue_overlay_rename_playlist_title": "rename playlist",

src/musikbox/musikbox.vcxproj.filters

@@ -82,7 +82,7 @@
       <Filter>app\util</Filter>
     </ClCompile>
     <ClCompile Include="cursespp\Checkbox.cpp">
-      <Filter>cursespp\widget</Filter>
+      <Filter>cursespp\window</Filter>
     </ClCompile>
     <ClCompile Include="cursespp\ListOverlay.cpp">
       <Filter>cursespp\overlay</Filter>
@@ -97,10 +97,10 @@
       <Filter>cursespp\overlay</Filter>
     </ClCompile>
     <ClCompile Include="cursespp\TextInput.cpp">
-      <Filter>cursespp\widget</Filter>
+      <Filter>cursespp\window</Filter>
     </ClCompile>
     <ClCompile Include="cursespp\TextLabel.cpp">
-      <Filter>cursespp\widget</Filter>
+      <Filter>cursespp\window</Filter>
     </ClCompile>
     <ClCompile Include="cursespp\LayoutBase.cpp">
       <Filter>cursespp\layout</Filter>
@@ -112,16 +112,16 @@
       <Filter>cursespp\adapter</Filter>
     </ClCompile>
     <ClCompile Include="cursespp\ScrollableWindow.cpp">
-      <Filter>cursespp\widget</Filter>
+      <Filter>cursespp\window</Filter>
     </ClCompile>
     <ClCompile Include="cursespp\ShortcutsWindow.cpp">
-      <Filter>cursespp\widget</Filter>
+      <Filter>cursespp\window</Filter>
     </ClCompile>
     <ClCompile Include="cursespp\ListWindow.cpp">
-      <Filter>cursespp\widget</Filter>
+      <Filter>cursespp\window</Filter>
     </ClCompile>
     <ClCompile Include="cursespp\Window.cpp">
-      <Filter>cursespp\widget</Filter>
+      <Filter>cursespp\window</Filter>
     </ClCompile>
     <ClCompile Include="cursespp\SingleLineEntry.cpp">
       <Filter>cursespp\adapter</Filter>
@@ -272,7 +272,7 @@
       <Filter>app\util</Filter>
     </ClInclude>
     <ClInclude Include="cursespp\Checkbox.h">
-      <Filter>cursespp\widget</Filter>
+      <Filter>cursespp\window</Filter>
     </ClInclude>
     <ClInclude Include="cursespp\ListOverlay.h">
       <Filter>cursespp\overlay</Filter>
@@ -287,10 +287,10 @@
       <Filter>cursespp\overlay</Filter>
     </ClInclude>
     <ClInclude Include="cursespp\TextInput.h">
-      <Filter>cursespp\widget</Filter>
+      <Filter>cursespp\window</Filter>
     </ClInclude>
     <ClInclude Include="cursespp\TextLabel.h">
-      <Filter>cursespp\widget</Filter>
+      <Filter>cursespp\window</Filter>
     </ClInclude>
     <ClInclude Include="cursespp\LayoutBase.h">
       <Filter>cursespp\layout</Filter>
@@ -305,16 +305,16 @@
       <Filter>cursespp\adapter</Filter>
     </ClInclude>
     <ClInclude Include="cursespp\ScrollableWindow.h">
-      <Filter>cursespp\widget</Filter>
+      <Filter>cursespp\window</Filter>
     </ClInclude>
     <ClInclude Include="cursespp\ShortcutsWindow.h">
-      <Filter>cursespp\widget</Filter>
+      <Filter>cursespp\window</Filter>
     </ClInclude>
     <ClInclude Include="cursespp\ListWindow.h">
-      <Filter>cursespp\widget</Filter>
+      <Filter>cursespp\window</Filter>
     </ClInclude>
     <ClInclude Include="cursespp\Window.h">
-      <Filter>cursespp\widget</Filter>
+      <Filter>cursespp\window</Filter>
     </ClInclude>
     <ClInclude Include="cursespp\SingleLineEntry.h">
       <Filter>cursespp\adapter</Filter>
@@ -360,9 +360,6 @@
     <Filter Include="app\overlay">
       <UniqueIdentifier>{a84f242d-d70b-49e9-975e-63fc73954a2b}</UniqueIdentifier>
     </Filter>
-    <Filter Include="cursespp\widget">
-      <UniqueIdentifier>{adfba99d-6228-438a-9e4b-d3c4daf6202b}</UniqueIdentifier>
-    </Filter>
     <Filter Include="cursespp\overlay">
       <UniqueIdentifier>{3e0fdd20-9aa9-430c-b675-43a7906ee79e}</UniqueIdentifier>
     </Filter>
@@ -375,6 +372,9 @@
     <Filter Include="cursespp\util">
       <UniqueIdentifier>{4a6b94ec-80fd-476a-b924-d7bc0495744a}</UniqueIdentifier>
     </Filter>
+    <Filter Include="cursespp\window">
+      <UniqueIdentifier>{adfba99d-6228-438a-9e4b-d3c4daf6202b}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="musikbox.rc" />