X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-cui.c;h=3c14f21bea32f55fc98d4cd433eba27fd6d0a66f;hp=6a6169431c8cedbc47e95b0b90559a024746a1ea;hb=24a530d0b58f57f151ee6d3df9f747ae98ef759f;hpb=08bc314efca8bbde9e9461c4d425caf1e0ad0e5f diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c index 6a61694..3c14f21 100644 --- a/ui/ncurses/nc-cui.c +++ b/ui/ncurses/nc-cui.c @@ -31,6 +31,7 @@ #include "talloc/talloc.h" #include "waiter/waiter.h" #include "process/process.h" +#include "i18n/i18n.h" #include "ui/common/discover-client.h" #include "ui/common/ui-system.h" #include "nc-cui.h" @@ -39,6 +40,8 @@ #include "nc-sysinfo.h" #include "nc-helpscreen.h" +extern const struct help_text main_menu_help_text; + static void cui_start(void) { initscr(); /* Initialize ncurses. */ @@ -116,7 +119,7 @@ int cui_run_cmd(struct pmenu_item *item) struct cui *cui = cui_from_item(item); const char **cmd_argv = item->data; - nc_scr_status_printf(cui->current, "Running %s...", cmd_argv[0]); + nc_scr_status_printf(cui->current, _("Running %s..."), cmd_argv[0]); def_prog_mode(); @@ -127,7 +130,8 @@ int cui_run_cmd(struct pmenu_item *item) if (result) { pb_log("%s: failed: '%s'\n", __func__, cmd_argv[0]); - nc_scr_status_printf(cui->current, "Failed: %s", cmd_argv[0]); + nc_scr_status_printf(cui->current, _("Failed: %s"), + cmd_argv[0]); } return result; @@ -147,13 +151,13 @@ static int cui_boot(struct pmenu_item *item) pb_debug("%s: %s\n", __func__, cod->name); - nc_scr_status_printf(cui->current, "Booting %s...", cod->name); + nc_scr_status_printf(cui->current, _("Booting %s..."), cod->name); result = discover_client_boot(cui->client, NULL, cod->opt, cod->bd); if (result) { nc_scr_status_printf(cui->current, - "Failed: boot %s", cod->bd->image); + _("Failed: boot %s"), cod->bd->image); } return 0; @@ -180,7 +184,7 @@ static void cui_boot_editor_on_exit(struct cui *cui, int insert_pt; cod = talloc_zero(NULL, struct cui_opt_data); - cod->name = talloc_asprintf(cod, "User item %u", ++user_idx); + cod->name = talloc_asprintf(cod, _("User item %u"), ++user_idx); item = pmenu_item_create(menu, cod->name); if (!item) { @@ -268,7 +272,8 @@ static void cui_help_exit(struct cui *cui) cui->help_screen = NULL; } -void cui_show_help(struct cui *cui, const char *title, const char *text) +void cui_show_help(struct cui *cui, const char *title, + const struct help_text *text) { if (!cui->current) return; @@ -572,7 +577,8 @@ static void cui_update_status(struct boot_status *status, void *arg) nc_scr_status_printf(cui->current, "%s: %s", - status->type == BOOT_STATUS_ERROR ? "Error" : "Info", + status->type == BOOT_STATUS_ERROR ? + _("Error") : _("Info"), status->message); } @@ -623,8 +629,8 @@ static void cui_update_config(struct config *config, void *arg) if (config->safe_mode) nc_scr_status_printf(cui->current, - "SAFE MODE: select '%s' to continue", - "Rescan devices"); + _("SAFE MODE: select '%s' to continue"), + _("Rescan devices")); } int cui_send_config(struct cui *cui, struct config *config) @@ -637,6 +643,92 @@ void cui_send_reinit(struct cui *cui) discover_client_send_reinit(cui->client); } +static int menu_sysinfo_execute(struct pmenu_item *item) +{ + cui_show_sysinfo(cui_from_item(item)); + return 0; +} + +static int menu_config_execute(struct pmenu_item *item) +{ + cui_show_config(cui_from_item(item)); + return 0; +} + +static int menu_reinit_execute(struct pmenu_item *item) +{ + cui_send_reinit(cui_from_item(item)); + return 0; +} + +/** + * pb_mm_init - Setup the main menu instance. + */ +static struct pmenu *main_menu_init(struct cui *cui) +{ + struct pmenu_item *i; + struct pmenu *m; + int result; + + m = pmenu_init(cui, 5, cui_on_exit); + if (!m) { + pb_log("%s: failed\n", __func__); + return NULL; + } + + m->on_new = cui_item_new; + + m->scr.frame.ltitle = talloc_asprintf(m, + "Petitboot (" PACKAGE_VERSION ")"); + m->scr.frame.rtitle = NULL; + m->scr.frame.help = talloc_strdup(m, + _("Enter=accept, e=edit, n=new, x=exit, h=help")); + m->scr.frame.status = talloc_strdup(m, _("Welcome to Petitboot")); + + /* add a separator */ + i = pmenu_item_create(m, " "); + item_opts_off(i->nci, O_SELECTABLE); + pmenu_item_insert(m, i, 0); + + /* add system items */ + i = pmenu_item_create(m, _("System information")); + i->on_execute = menu_sysinfo_execute; + pmenu_item_insert(m, i, 1); + + i = pmenu_item_create(m, _("System configuration")); + i->on_execute = menu_config_execute; + pmenu_item_insert(m, i, 2); + + i = pmenu_item_create(m, _("Rescan devices")); + i->on_execute = menu_reinit_execute; + pmenu_item_insert(m, i, 3); + + i = pmenu_item_create(m, _("Exit to shell")); + i->on_execute = pmenu_exit_cb; + pmenu_item_insert(m, i, 4); + + result = pmenu_setup(m); + + if (result) { + pb_log("%s:%d: pmenu_setup failed: %s\n", __func__, __LINE__, + strerror(errno)); + goto fail_setup; + } + + m->help_title = _("main menu"); + m->help_text = &main_menu_help_text; + + menu_opts_off(m->ncm, O_SHOWDESC); + set_menu_mark(m->ncm, " *"); + set_current_item(m->ncm, i->nci); + + return m; + +fail_setup: + talloc_free(m); + return NULL; +} + static struct discover_client_ops cui_client_ops = { .device_add = NULL, .boot_option_add = cui_boot_option_add, @@ -663,10 +755,9 @@ struct cui *cui_init(void* platform_info, unsigned int i; cui = talloc_zero(NULL, struct cui); - if (!cui) { pb_log("%s: alloc cui failed.\n", __func__); - fprintf(stderr, "%s: alloc cui failed.\n", __func__); + fprintf(stderr, _("%s: alloc cui failed.\n"), __func__); goto fail_alloc; } @@ -699,19 +790,19 @@ retry_start: goto retry_start; pb_log("%s: discover_client_init failed.\n", __func__); - fprintf(stderr, "%s: error: discover_client_init failed.\n", + fprintf(stderr, _("%s: error: discover_client_init failed.\n"), __func__); - fprintf(stderr, "could not start pb-discover, the petitboot " - "daemon.\n"); + fprintf(stderr, _("could not start pb-discover, the petitboot " + "daemon.\n")); goto fail_client_init; } if (!cui->client) { pb_log("%s: discover_client_init failed.\n", __func__); - fprintf(stderr, "%s: error: discover_client_init failed.\n", + fprintf(stderr, _("%s: error: discover_client_init failed.\n"), __func__); - fprintf(stderr, "check that pb-discover, " - "the petitboot daemon is running.\n"); + fprintf(stderr, _("check that pb-discover, " + "the petitboot daemon is running.\n")); goto fail_client_init; } @@ -719,6 +810,10 @@ retry_start: talloc_steal(cui, cui->client); cui_start(); + cui->main = main_menu_init(cui); + if (!cui->main) + goto fail_client_init; + waiter_register_io(cui->waitset, STDIN_FILENO, WAIT_IN, cui_process_key, cui); @@ -749,13 +844,12 @@ fail_alloc: * Returns 0 on success (return to shell), -1 on error (should restart). */ -int cui_run(struct cui *cui, struct pmenu *main, unsigned int default_item) +int cui_run(struct cui *cui) { assert(main); - cui->main = main; cui->current = &cui->main->scr; - cui->default_item = default_item; + cui->default_item = 0; nc_scr_post(cui->current);