ui/ncurses: Use 'New' instead of 'Open'
authorJeremy Kerr <jk@ozlabs.org>
Wed, 9 Oct 2013 13:34:53 +0000 (21:34 +0800)
committerJeremy Kerr <jk@ozlabs.org>
Thu, 10 Oct 2013 08:08:54 +0000 (16:08 +0800)
"Open" is ambiguous in the context of the boot menu; use "new" instead.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
ui/ncurses/generic-main.c
ui/ncurses/nc-menu.c

index d0563f0cac7137bda3d53aaa3980fd84e3afc7a5..c40ebabb124e5fb89cd719c86a4082670df192be 100644 (file)
@@ -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,
                "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");
        m->scr.frame.status = talloc_strdup(m, "Welcome to Petitboot");
 
        i = pmenu_item_init(m, 0, "Exit to Shell");
index e28168edd4cf6d253e10e4c2f04fa3939fd25192..073860bbfc772f0a9b59730111ddd1e382870d0b 100644 (file)
@@ -232,8 +232,7 @@ static void pmenu_process_key(struct nc_scr *scr, int key)
                if (item->on_edit)
                        item->on_edit(item);
                break;
                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;
                if (menu->on_open)
                        menu->on_open(menu);
                break;