menu items for pause and network play

diff --git a/disobedience/control.c b/disobedience/control.c
index d3c4e18a3a09a6388a77dd6534093565c611d045..36282cfdf8b1fc05df7dcf0e2ff13dd16d36f762 100644 (file)
--- a/disobedience/control.c
+++ b/disobedience/control.c
@@ -113,20 +113,20 @@ static struct icon icons[] = {
   {
     "pause.png",                        /* icon */
     "Pause playing track",              /* tip */
-    0,                                  /* menuitem */
+    "<GdisorderMain>/Control/Playing",  /* menuitem */
     update_pause,                       /* update */
     disorder_eclient_pause,             /* action */
-    ICON_INACTIVE,                      /* flags */
+    ICON_ACTIVE,                        /* flags */
     0,                                  /* button */
     0                                   /* item */
   },
   {
     "play.png",                         /* icon */
     "Resume playing track",             /* tip */
-    0,                                  /* menuitem */
+    "<GdisorderMain>/Control/Playing",  /* menuitem */
     update_play,                        /* update */
     disorder_eclient_resume,            /* action */
-    ICON_ACTIVE,                        /* flags */
+    ICON_INACTIVE,                      /* flags */
     0,                                  /* button */
     0                                   /* item */
   },
@@ -183,7 +183,7 @@ static struct icon icons[] = {
   {
     "speaker.png",                      /* icon */
     "Play network stream",              /* tip */
-    0,                                  /* menuitem */
+    "<GdisorderMain>/Control/Network player", /* menuitem */
     update_rtp,                         /* update */
     enable_rtp,                         /* action */
     ICON_INACTIVE,                      /* flags */
@@ -193,7 +193,7 @@ static struct icon icons[] = {
   {
     "speakercross.png",                 /* icon */
     "Stop playing network stream",      /* tip */
-    0,                                  /* menuitem */
+    "<GdisorderMain>/Control/Network player", /* menuitem */
     update_nortp,                       /* update */
     disable_rtp,                        /* action */
     ICON_ACTIVE,                        /* flags */

diff --git a/disobedience/menu.c b/disobedience/menu.c
index fcf9e9f2cd49c818950aabdaa0195071563666f5..843f45148565ea7a20c61ebc07496d356ae3a543 100644 (file)
--- a/disobedience/menu.c
+++ b/disobedience/menu.c
@@ -205,6 +205,14 @@ GtkWidget *menubar(GtkWidget *w) {
       0,                                /* item_type */
       0                                 /* extra_data */
     },
+    {
+      (char *)"/Control/Playing",       /* path */
+      (char *)"<CTRL>P",                /* accelerator */
+      0,                                /* callback */
+      0,                                /* callback_action */
+      (char *)"<CheckItem>",            /* item_type */
+      0                                 /* extra_data */
+    },
     {
       (char *)"/Control/Random play",   /* path */
       (char *)"<CTRL>R",                /* accelerator */
@@ -213,6 +221,14 @@ GtkWidget *menubar(GtkWidget *w) {
       (char *)"<CheckItem>",            /* item_type */
       0                                 /* extra_data */
     },
+    {
+      (char *)"/Control/Network player", /* path */
+      (char *)"<CTRL>N",                /* accelerator */
+      0,                                /* callback */
+      0,                                /* callback_action */
+      (char *)"<CheckItem>",            /* item_type */
+      0                                 /* extra_data */
+    },
     
     {
       (char *)"/Help",                  /* path */