aboutsummaryrefslogtreecommitdiffstats
path: root/src/screen_help.c
diff options
context:
space:
mode:
authorKalle Wallin <kaw@linux.se>2004-11-15 11:23:11 +0000
committerKalle Wallin <kaw@linux.se>2004-11-15 11:23:11 +0000
commite3c905a56bcc1fed3848485201a4a434aa9fc162 (patch)
treeaed87e32dc8c39473fa86b3d11d2048a06ac055f /src/screen_help.c
parent41d25e22f8b3fabc954d5b58db6d1d36706aa418 (diff)
downloadmpd-e3c905a56bcc1fed3848485201a4a434aa9fc162.tar.gz
mpd-e3c905a56bcc1fed3848485201a4a434aa9fc162.tar.xz
mpd-e3c905a56bcc1fed3848485201a4a434aa9fc162.zip
Added a search screen
git-svn-id: https://svn.musicpd.org/ncmpc/trunk@2668 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src/screen_help.c')
-rw-r--r--src/screen_help.c20
1 files changed, 17 insertions, 3 deletions
diff --git a/src/screen_help.c b/src/screen_help.c
index 73ccd6743..66acc3d87 100644
--- a/src/screen_help.c
+++ b/src/screen_help.c
@@ -53,6 +53,9 @@ static help_text_row_t help_text[] =
{ 0, CMD_SCREEN_HELP, NULL },
{ 0, CMD_SCREEN_PLAY, NULL },
{ 0, CMD_SCREEN_FILE, NULL },
+#ifdef ENABLE_SEARCH_SCREEN
+ { 0, CMD_SCREEN_SEARCH, NULL },
+#endif
#ifdef ENABLE_CLOCK_SCREEN
{ 0, CMD_SCREEN_CLOCK, NULL },
#endif
@@ -105,11 +108,22 @@ static help_text_row_t help_text[] =
{ 0, CMD_NONE, NULL },
{ 1, CMD_NONE, N_("Keys - Browse screen") },
{ 2, CMD_NONE, NULL },
- { 0, CMD_PLAY, N_("Enter directory") },
+ { 0, CMD_PLAY, N_("Enter directory/Select and play song") },
{ 0, CMD_SELECT, NULL },
- { 0, CMD_DELETE, NULL },
+ { 0, CMD_DELETE, N_("Delete playlist") },
{ 0, CMD_SCREEN_UPDATE, NULL },
+#ifdef ENABLE_SEARCH_SCREEN
+ { 0, CMD_NONE, NULL },
+ { 0, CMD_NONE, NULL },
+ { 1, CMD_NONE, N_("Keys - Search screen") },
+ { 2, CMD_NONE, NULL },
+ { 0, CMD_SCREEN_SEARCH, N_("Search") },
+ { 0, CMD_PLAY, N_("Select and play") },
+ { 0, CMD_SELECT, NULL },
+ { 0, CMD_SEARCH_MODE, NULL },
+#endif
+
{ 0, CMD_NONE, NULL },
{-1, CMD_NONE, NULL }
};
@@ -255,7 +269,7 @@ help_cmd(screen_t *screen, mpdclient_t *c, command_t cmd)
lw->selected = lw->start+lw->rows;
if( screen_find(screen, c,
lw, help_text_rows,
- cmd, list_callback) )
+ cmd, list_callback, NULL) )
{
/* center the row */
lw->start = lw->selected-(lw->rows/2);