From 39fe10140c119ea11d2834416d59ff0995675adc Mon Sep 17 00:00:00 2001
Message-Id: <39fe10140c119ea11d2834416d59ff0995675adc.1714609470.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Sun, 29 Jul 2007 16:59:48 +0100
Subject: [PATCH] more verbose menu items
Organization: Straylight/Edgeware

From: rjk@greenend.org.uk <>

---
 disobedience/choose.c | 15 +++++++++++++--
 disobedience/menu.c   | 10 +++++-----
 disobedience/queue.c  | 12 ++++++------
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/disobedience/choose.c b/disobedience/choose.c
index cf22eaf..842a200 100644
--- a/disobedience/choose.c
+++ b/disobedience/choose.c
@@ -137,17 +137,24 @@ static void clicked_choosenode(GtkWidget attribute((unused)) *widget,
                                gpointer user_data);
 
 static void activate_play(GtkMenuItem *menuitem, gpointer user_data);
+#if 0
 static void activate_remove(GtkMenuItem *menuitem, gpointer user_data);
+#endif
 static void activate_properties(GtkMenuItem *menuitem, gpointer user_data);
 
 static gboolean sensitive_play(struct choosenode *cn);
+#if 0
 static gboolean sensitive_remove(struct choosenode *cn);
+#endif
 static gboolean sensitive_properties(struct choosenode *cn);
 
 static struct menuitem menuitems[] = {
-  { "Play", activate_play, sensitive_play, 0, 0 },
+  { "Play track", activate_play, sensitive_play, 0, 0 },
+#if 0
+  /* Not implemented yet */
   { "Remove", activate_remove, sensitive_remove, 0, 0 },
-  { "Properties", activate_properties, sensitive_properties, 0, 0 },
+#endif
+  { "Track properties", activate_properties, sensitive_properties, 0, 0 },
 };
 
 #define NMENUITEMS (int)(sizeof menuitems / sizeof *menuitems)
@@ -903,10 +910,12 @@ static void activate_play(GtkMenuItem attribute((unused)) *menuitem,
     disorder_eclient_play(client, tracks[n], 0, 0);
 }
 
+#if 0
 static void activate_remove(GtkMenuItem attribute((unused)) *menuitem,
                             gpointer attribute((unused)) user_data) {
   /* TODO remove all selected tracks */
 }
+#endif
 
 static void activate_properties(GtkMenuItem attribute((unused)) *menuitem,
                                 gpointer attribute((unused)) user_data) {
@@ -920,9 +929,11 @@ static gboolean sensitive_play(struct choosenode attribute((unused)) *cn) {
   return !!files_selected;
 }
 
+#if 0
 static gboolean sensitive_remove(struct choosenode attribute((unused)) *cn) {
   return FALSE;                         /* not implemented yet */
 }
+#endif
 
 static gboolean sensitive_properties(struct choosenode attribute((unused)) *cn) {
   return !!files_selected;
diff --git a/disobedience/menu.c b/disobedience/menu.c
index d026d55..ded1f89 100644
--- a/disobedience/menu.c
+++ b/disobedience/menu.c
@@ -104,12 +104,12 @@ static void about_popup_got_version(void attribute((unused)) *v,
 GtkWidget *menubar(GtkWidget *w) {
   static const GtkItemFactoryEntry entries[] = {
     { (char *)"/File", 0,  0, 0, (char *)"<Branch>", 0 },
-    { (char *)"/File/Quit", (char *)"<CTRL>Q", quit_program, 0,
+    { (char *)"/File/Quit Disobedience", (char *)"<CTRL>Q", quit_program, 0,
       (char *)"<StockItem>", GTK_STOCK_QUIT },
     { (char *)"/Edit", 0,  0, 0, (char *)"<Branch>", 0 },
-    { (char *)"/Edit/Select All", (char *)"<CTRL>A", select_all, 0,
+    { (char *)"/Edit/Select all tracks", (char *)"<CTRL>A", select_all, 0,
       0, 0 },
-    { (char *)"/Edit/Properties", 0, properties_item, 0,
+    { (char *)"/Edit/Track properties", 0, properties_item, 0,
       0, 0 },
     { (char *)"/Help", 0,  0, 0, (char *)"<Branch>", 0 },
     { (char *)"/Help/About DisOrder", 0,  about_popup, 0,
@@ -129,9 +129,9 @@ GtkWidget *menubar(GtkWidget *w) {
                                 0);
   gtk_window_add_accel_group(GTK_WINDOW(w), accel);
   selectall_widget = gtk_item_factory_get_widget(itemfactory,
-						 "<GdisorderMain>/Edit/Select All");
+						 "<GdisorderMain>/Edit/Select all tracks");
   properties_widget = gtk_item_factory_get_widget(itemfactory,
-						  "<GdisorderMain>/Edit/Properties");
+						  "<GdisorderMain>/Edit/Track properties");
   assert(selectall_widget != 0);
   assert(properties_widget != 0);
   return gtk_item_factory_get_widget(itemfactory,
diff --git a/disobedience/queue.c b/disobedience/queue.c
index f9b9ec8..f1df8f8 100644
--- a/disobedience/queue.c
+++ b/disobedience/queue.c
@@ -1183,10 +1183,10 @@ static gboolean adjust_sofar(gpointer attribute((unused)) data) {
 /* Popup menu for the queue.  Put the properties first so that finger trouble
  * is less dangerous. */
 static struct menuitem queue_menu[] = {
-  { "Properties", properties_activate, properties_sensitive, 0, 0 },
-  { "Select all", selectall_activate, selectall_sensitive, 0, 0 },
-  { "Scratch", scratch_activate, scratch_sensitive, 0, 0 },
-  { "Remove", remove_activate, remove_sensitive, 0, 0 },
+  { "Track properties", properties_activate, properties_sensitive, 0, 0 },
+  { "Select all tracks", selectall_activate, selectall_sensitive, 0, 0 },
+  { "Scratch track", scratch_activate, scratch_sensitive, 0, 0 },
+  { "Remove track from queue", remove_activate, remove_sensitive, 0, 0 },
   { 0, 0, 0, 0, 0 }
 };
 
@@ -1238,8 +1238,8 @@ static struct queue_entry *fixup_recent(struct queue_entry *q) {
 }
 
 static struct menuitem recent_menu[] = {
-  { "Properties", properties_activate, properties_sensitive,0, 0 },
-  { "Select all", selectall_activate, selectall_sensitive, 0, 0 },
+  { "Track properties", properties_activate, properties_sensitive,0, 0 },
+  { "Select all tracks", selectall_activate, selectall_sensitive, 0, 0 },
   { 0, 0, 0, 0, 0 }
 };
 
-- 
[mdw]