STATE_EDIT,
STATE_CANCEL,
STATE_SAVE,
+ STATE_HELP,
} state;
void (*on_exit)(struct cui *cui,
struct pmenu_item *item,
struct nc_widget_label *args_l;
struct nc_widget_textbox *args_f;
struct nc_widget_button *ok_b;
+ struct nc_widget_button *help_b;
struct nc_widget_button *cancel_b;
} widgets;
char *args;
};
+extern const char *boot_editor_help_text;
+
static struct boot_editor *boot_editor_from_scr(struct nc_scr *scr)
{
struct boot_editor *boot_editor;
static int boot_editor_post(struct nc_scr *scr)
{
struct boot_editor *boot_editor = boot_editor_from_scr(scr);
-
widgetset_post(boot_editor->widgetset);
nc_scr_frame_draw(scr);
+ redrawwin(scr->main_ncw);
+ wrefresh(boot_editor->scr.main_ncw);
pad_refresh(boot_editor);
return 0;
}
else if (key == 'x' || key == 27)
boot_editor->state = STATE_CANCEL;
+ else if (key == 'h')
+ boot_editor->state = STATE_HELP;
+
item = NULL;
bd = NULL;
case STATE_CANCEL:
boot_editor->on_exit(boot_editor->cui, item, bd);
break;
+ case STATE_HELP:
+ boot_editor->state = STATE_EDIT;
+ cui_show_help(boot_editor->cui, "Boot Option Editor",
+ boot_editor_help_text);
+ break;
default:
break;
}
boot_editor->state = STATE_SAVE;
}
+static void help_click(void *arg)
+{
+ struct boot_editor *boot_editor = arg;
+ boot_editor->state = STATE_HELP;
+}
+
static void cancel_click(void *arg)
{
struct boot_editor *boot_editor = arg;
y++;
widget_move(widget_button_base(boot_editor->widgets.ok_b), y, 9);
- widget_move(widget_button_base(boot_editor->widgets.cancel_b), y, 19);
+ widget_move(widget_button_base(boot_editor->widgets.help_b), y, 19);
+ widget_move(widget_button_base(boot_editor->widgets.cancel_b), y, 29);
}
static void boot_editor_widget_focus(struct nc_widget *widget, void *arg)
widgetset_set_widget_focus(boot_editor->widgetset,
boot_editor_widget_focus, boot_editor);
- boot_editor->widgets.device_l = widget_new_label(set, 0, 0, "device:");
+ boot_editor->widgets.device_l = widget_new_label(set, 0, 0, "Device:");
boot_editor->widgets.device_f = widget_new_select(set, 0, 0,
field_size);
widget_select_on_change(boot_editor->widgets.device_f,
boot_editor_populate_device_select(boot_editor, sysinfo);
- boot_editor->widgets.image_l = widget_new_label(set, 0, 0, "image:");
+ boot_editor->widgets.image_l = widget_new_label(set, 0, 0,
+ "Kernel:");
boot_editor->widgets.image_f = widget_new_textbox(set, 0, 0,
field_size, boot_editor->image);
- boot_editor->widgets.initrd_l = widget_new_label(set, 0, 0, "initrd:");
+ boot_editor->widgets.initrd_l = widget_new_label(set, 0, 0,
+ "Initrd:");
boot_editor->widgets.initrd_f = widget_new_textbox(set, 0, 0,
field_size,
boot_editor->initrd);
- boot_editor->widgets.dtb_l = widget_new_label(set, 0, 0, "dtb:");
+ boot_editor->widgets.dtb_l = widget_new_label(set, 0, 0,
+ "Device tree:");
boot_editor->widgets.dtb_f = widget_new_textbox(set, 0, 0,
field_size, boot_editor->dtb);
- boot_editor->widgets.args_l = widget_new_label(set, 0, 0, "args:");
+ boot_editor->widgets.args_l = widget_new_label(set, 0, 0,
+ "Boot arguments:");
boot_editor->widgets.args_f = widget_new_textbox(set, 0, 0,
field_size, boot_editor->args);
boot_editor->widgets.ok_b = widget_new_button(set, 0, 0, 6,
"OK", ok_click, boot_editor);
+ boot_editor->widgets.help_b = widget_new_button(set, 0, 0, 6,
+ "Help", help_click, boot_editor);
boot_editor->widgets.cancel_b = widget_new_button(set, 0, 0, 6,
"Cancel", cancel_click, boot_editor);
}
boot_editor->state = STATE_EDIT;
boot_editor->label_x = 1;
- boot_editor->field_x = 9;
+ boot_editor->field_x = 17;
nc_scr_init(&boot_editor->scr, pb_boot_editor_sig, 0,
cui, boot_editor_process_key,
"Petitboot Option Editor");
boot_editor->scr.frame.rtitle = NULL;
boot_editor->scr.frame.help = talloc_strdup(boot_editor,
- "Enter=accept");
+ "tab=next, shift+tab=previous, x=exit, h=help");
nc_scr_frame_draw(&boot_editor->scr);
if (item) {