X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-boot-editor.c;h=3d4621b3db75baddda777537179493a524faa131;hp=bd2bf6e6abe9898779b9a1c364191957534b4874;hb=563ebfa6e702f917d277d4ea9dd5e9eba17e51f7;hpb=7f8fdbcd432097b035394ee5b71dbfde728c36f0 diff --git a/ui/ncurses/nc-boot-editor.c b/ui/ncurses/nc-boot-editor.c index bd2bf6e..3d4621b 100644 --- a/ui/ncurses/nc-boot-editor.c +++ b/ui/ncurses/nc-boot-editor.c @@ -16,15 +16,16 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#if defined(HAVE_CONFIG_H) #include "config.h" - -#define _GNU_SOURCE +#endif #include #include #include "log/log.h" #include "talloc/talloc.h" +#include "i18n/i18n.h" #include "nc-boot-editor.h" #include "nc-widgets.h" @@ -37,6 +38,7 @@ struct boot_editor { STATE_EDIT, STATE_CANCEL, STATE_SAVE, + STATE_HELP, } state; void (*on_exit)(struct cui *cui, struct pmenu_item *item, @@ -60,6 +62,7 @@ struct boot_editor { 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; @@ -70,6 +73,8 @@ struct boot_editor { char *args; }; +extern const struct help_text boot_editor_help_text; + static struct boot_editor *boot_editor_from_scr(struct nc_scr *scr) { struct boot_editor *boot_editor; @@ -103,9 +108,10 @@ static struct boot_editor *boot_editor_from_arg(void *arg) 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; } @@ -136,7 +142,7 @@ static char *conditional_prefix(struct pb_boot_data *ctx, if (!value || !*value) return NULL; - sep = NULL; + sep = ""; if (!prefix) prefix = ""; else if (prefix[strlen(prefix)] != '/') @@ -199,6 +205,9 @@ static void boot_editor_process_key(struct nc_scr *scr, int key) else if (key == 'x' || key == 27) boot_editor->state = STATE_CANCEL; + else if (key == 'h') + boot_editor->state = STATE_HELP; + item = NULL; bd = NULL; @@ -210,6 +219,11 @@ static void boot_editor_process_key(struct nc_scr *scr, int key) 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; } @@ -234,6 +248,12 @@ static void ok_click(void *arg) 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; @@ -284,7 +304,8 @@ static void boot_editor_layout_widgets(struct boot_editor *boot_editor) 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, 32); } static void boot_editor_widget_focus(struct nc_widget *widget, void *arg) @@ -345,7 +366,7 @@ static void boot_editor_populate_device_select(struct boot_editor *boot_editor, * changed. */ selected = !boot_editor->selected_device; - widget_select_add_option(select, -1, "Specify paths/URLs manually", + widget_select_add_option(select, -1, _("Specify paths/URLs manually"), selected); } @@ -425,7 +446,8 @@ static void boot_editor_setup_widgets(struct boot_editor *boot_editor, 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, @@ -433,27 +455,33 @@ static void boot_editor_setup_widgets(struct boot_editor *boot_editor, 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.cancel_b = widget_new_button(set, 0, 0, 6, - "Cancel", cancel_click, boot_editor); + _("OK"), ok_click, boot_editor); + boot_editor->widgets.help_b = widget_new_button(set, 0, 0, 9, + _("Help"), help_click, boot_editor); + boot_editor->widgets.cancel_b = widget_new_button(set, 0, 0, 9, + _("Cancel"), cancel_click, boot_editor); } void boot_editor_update(struct boot_editor *boot_editor, @@ -502,17 +530,18 @@ struct boot_editor *boot_editor_init(struct cui *cui, 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, boot_editor_post, boot_editor_unpost, boot_editor_resize); boot_editor->scr.frame.ltitle = talloc_strdup(boot_editor, - "Petitboot Option Editor"); + _("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) { struct pb_boot_data *bd = cod_from_item(item)->bd; @@ -533,6 +562,7 @@ struct boot_editor *boot_editor_init(struct cui *cui, boot_editor_setup_widgets(boot_editor, sysinfo); boot_editor_layout_widgets(boot_editor); + wrefresh(boot_editor->scr.main_ncw); return boot_editor; }