gtkui: corrected few action titles; fixed bug #1028 ("remove from disk" is not hidden when the option is to do so is set)

5 files changed, 15 insertions, 8 deletions

diff --git a/plugins/gtkui/deadbeef.glade b/plugins/gtkui/deadbeef.glade
index 0d243423..b3782497 100644
--- a/plugins/gtkui/deadbeef.glade
+++ b/plugins/gtkui/deadbeef.glade
@@ -3747,7 +3747,7 @@ Album</property>
 		    <widget class="GtkCheckButton" id="hide_delete_from_disk">
 		      <property name="visible">True</property>
 		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Hide &quot;Delete from disk&quot; context menu item</property>
+		      <property name="label" translatable="yes">Hide &quot;Remove From Disk&quot; context menu item</property>
 		      <property name="use_underline">True</property>
 		      <property name="relief">GTK_RELIEF_NORMAL</property>
 		      <property name="focus_on_click">True</property>
diff --git a/plugins/gtkui/gtkui.c b/plugins/gtkui/gtkui.c
index 52ac3306..83c572c1 100644
--- a/plugins/gtkui/gtkui.c
+++ b/plugins/gtkui/gtkui.c
@@ -1292,7 +1292,7 @@ static DB_plugin_action_t action_quit = {
 };
 
 static DB_plugin_action_t action_delete_from_disk = {
-    .title = "Delete From Disk",
+    .title = "Remove From Disk",
     .name = "delete_from_disk",
     .flags = DB_ACTION_MULTIPLE_TRACKS,
     .callback2 = action_delete_from_disk_handler,
diff --git a/plugins/gtkui/interface.c b/plugins/gtkui/interface.c
index 04c0de89..b08daf45 100644
--- a/plugins/gtkui/interface.c
+++ b/plugins/gtkui/interface.c
@@ -2131,7 +2131,7 @@ create_prefwin (void)
   gtk_widget_show (embolden_current);
   gtk_box_pack_start (GTK_BOX (vbox44), embolden_current, FALSE, FALSE, 0);
 
-  hide_delete_from_disk = gtk_check_button_new_with_mnemonic (_("Hide \"Delete from disk\" context menu item"));
+  hide_delete_from_disk = gtk_check_button_new_with_mnemonic (_("Hide \"Remove From Disk\" context menu item"));
   gtk_widget_show (hide_delete_from_disk);
   gtk_box_pack_start (GTK_BOX (vbox44), hide_delete_from_disk, FALSE, FALSE, 0);
 
diff --git a/plugins/gtkui/plcommon.c b/plugins/gtkui/plcommon.c
index 2e72155c..1f7b65d2 100644
--- a/plugins/gtkui/plcommon.c
+++ b/plugins/gtkui/plcommon.c
@@ -553,12 +553,12 @@ list_context_menu (DdbListview *listview, DdbListviewIter it, int idx) {
     GtkWidget *reload_metadata;
 
     playlist_menu = gtk_menu_new ();
-    add_to_playback_queue1 = gtk_menu_item_new_with_mnemonic (_("Add to playback queue"));
+    add_to_playback_queue1 = gtk_menu_item_new_with_mnemonic (_("Add To Playback Queue"));
     gtk_widget_show (add_to_playback_queue1);
     gtk_container_add (GTK_CONTAINER (playlist_menu), add_to_playback_queue1);
     g_object_set_data (G_OBJECT (add_to_playback_queue1), "ps", listview);
 
-    remove_from_playback_queue1 = gtk_menu_item_new_with_mnemonic (_("Remove from playback queue"));
+    remove_from_playback_queue1 = gtk_menu_item_new_with_mnemonic (_("Remove From Playback Queue"));
     if (inqueue == -1) {
         gtk_widget_set_sensitive (remove_from_playback_queue1, FALSE);
     }
@@ -566,7 +566,7 @@ list_context_menu (DdbListview *listview, DdbListviewIter it, int idx) {
     gtk_container_add (GTK_CONTAINER (playlist_menu), remove_from_playback_queue1);
     g_object_set_data (G_OBJECT (remove_from_playback_queue1), "ps", listview);
 
-    reload_metadata = gtk_menu_item_new_with_mnemonic (_("Reload metadata"));
+    reload_metadata = gtk_menu_item_new_with_mnemonic (_("Reload Metadata"));
     gtk_widget_show (reload_metadata);
     gtk_container_add (GTK_CONTAINER (playlist_menu), reload_metadata);
     g_object_set_data (G_OBJECT (reload_metadata), "ps", listview);
@@ -584,7 +584,7 @@ list_context_menu (DdbListview *listview, DdbListviewIter it, int idx) {
     int hide_remove_from_disk = deadbeef->conf_get_int ("gtkui.hide_remove_from_disk", 0);
 
     if (!hide_remove_from_disk) {
-        remove_from_disk = gtk_menu_item_new_with_mnemonic (_("Remove from disk"));
+        remove_from_disk = gtk_menu_item_new_with_mnemonic (_("Remove From Disk"));
         gtk_widget_show (remove_from_disk);
         gtk_container_add (GTK_CONTAINER (playlist_menu), remove_from_disk);
         g_object_set_data (G_OBJECT (remove_from_disk), "ps", listview);
@@ -722,7 +722,7 @@ list_context_menu (DdbListview *listview, DdbListviewIter it, int idx) {
     }
 
 
-    properties1 = gtk_menu_item_new_with_mnemonic (_("Properties"));
+    properties1 = gtk_menu_item_new_with_mnemonic (_("Track Properties"));
     gtk_widget_show (properties1);
     gtk_container_add (GTK_CONTAINER (playlist_menu), properties1);
     g_object_set_data (G_OBJECT (properties1), "ps", listview);
diff --git a/plugins/gtkui/pltmenu.c b/plugins/gtkui/pltmenu.c
index 6fd803a2..1393bbec 100644
--- a/plugins/gtkui/pltmenu.c
+++ b/plugins/gtkui/pltmenu.c
@@ -150,6 +150,9 @@ add_tab_actions (GtkWidget *menu) {
     int i;
 
     int added_entries = 0;
+
+    int hide_remove_from_disk = deadbeef->conf_get_int ("gtkui.hide_remove_from_disk", 0);
+
     for (i = 0; plugins[i]; i++)
     {
         if (!plugins[i]->get_actions)
@@ -165,6 +168,10 @@ add_tab_actions (GtkWidget *menu) {
             if (!(action->flags & DB_ACTION_MULTIPLE_TRACKS))
                 continue;
 
+            if (action->name && !strcmp (action->name, "delete_from_disk") && hide_remove_from_disk) {
+                continue;
+            }
+
             // create submenus (separated with '/')
             const char *prev = action->title;
             while (*prev && *prev == '/') {