From 685bdfbd932f507bfe86c668a6970b360f895617 Mon Sep 17 00:00:00 2001 Message-Id: <685bdfbd932f507bfe86c668a6970b360f895617.1714130968.git.mdw@distorted.org.uk> From: Mark Wooding Date: Sun, 21 Oct 2007 16:11:41 +0100 Subject: [PATCH 1/1] menu items for pause and network play Organization: Straylight/Edgeware From: Richard Kettlewell --- disobedience/control.c | 12 ++++++------ disobedience/menu.c | 16 ++++++++++++++++ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/disobedience/control.c b/disobedience/control.c index d3c4e18..36282cf 100644 --- 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 */ + "/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 */ + "/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 */ + "/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 */ + "/Control/Network player", /* menuitem */ update_nortp, /* update */ disable_rtp, /* action */ ICON_ACTIVE, /* flags */ diff --git a/disobedience/menu.c b/disobedience/menu.c index fcf9e9f..843f451 100644 --- 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 *)"P", /* accelerator */ + 0, /* callback */ + 0, /* callback_action */ + (char *)"", /* item_type */ + 0 /* extra_data */ + }, { (char *)"/Control/Random play", /* path */ (char *)"R", /* accelerator */ @@ -213,6 +221,14 @@ GtkWidget *menubar(GtkWidget *w) { (char *)"", /* item_type */ 0 /* extra_data */ }, + { + (char *)"/Control/Network player", /* path */ + (char *)"N", /* accelerator */ + 0, /* callback */ + 0, /* callback_action */ + (char *)"", /* item_type */ + 0 /* extra_data */ + }, { (char *)"/Help", /* path */ -- [mdw]