From 97c5d1f5d56d9ce890b4896ad7a9dc7ece7d4347 Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Wed, 9 Oct 2013 21:34:53 +0800 Subject: [PATCH] ui/ncurses: Use 'New' instead of 'Open' "Open" is ambiguous in the context of the boot menu; use "new" instead. Signed-off-by: Jeremy Kerr --- ui/ncurses/generic-main.c | 2 +- ui/ncurses/nc-menu.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ui/ncurses/generic-main.c b/ui/ncurses/generic-main.c index d0563f0..c40ebab 100644 --- a/ui/ncurses/generic-main.c +++ b/ui/ncurses/generic-main.c @@ -149,7 +149,7 @@ static struct pmenu *pb_mm_init(struct pb_cui *pb_cui) "Petitboot (" PACKAGE_VERSION ")"); m->scr.frame.rtitle = NULL; m->scr.frame.help = talloc_strdup(m, - "ESC=exit, Enter=accept, e=edit, o=open"); + "ESC=exit, Enter=accept, e=edit, n=new"); m->scr.frame.status = talloc_strdup(m, "Welcome to Petitboot"); i = pmenu_item_init(m, 0, "Exit to Shell"); diff --git a/ui/ncurses/nc-menu.c b/ui/ncurses/nc-menu.c index e28168e..073860b 100644 --- a/ui/ncurses/nc-menu.c +++ b/ui/ncurses/nc-menu.c @@ -232,8 +232,7 @@ static void pmenu_process_key(struct nc_scr *scr, int key) if (item->on_edit) item->on_edit(item); break; - case 'o': - DBGS("on_open: %p\n", menu->on_open); + case 'n': if (menu->on_open) menu->on_open(menu); break; -- 2.39.2