summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
01dac4f)
Selecting 'OK' in the configuration or language select screen will send
a configuration change to the server and exit safe mode.
Exit safe mode explicity and warn the user that they are about to exit
it.
Signed-off-by: Samuel Mendoza-Jonas <sam.mj@au1.ibm.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
msgstr ""
"Project-Id-Version: petitboot 20140623-g89bd2ed2-dirty\n"
"Report-Msgid-Bugs-To: Geoff Levand <geoff@infradead.org>\n"
msgstr ""
"Project-Id-Version: petitboot 20140623-g89bd2ed2-dirty\n"
"Report-Msgid-Bugs-To: Geoff Levand <geoff@infradead.org>\n"
-"POT-Creation-Date: 2014-08-29 13:24+1000\n"
+"POT-Creation-Date: 2014-08-29 13:42+1000\n"
"PO-Revision-Date: 2014-06-24 13:56+0800\n"
"Last-Translator: Jeremy Kerr <jk@ozlabs.org>\n"
"Language-Team: English\n"
"PO-Revision-Date: 2014-06-24 13:56+0800\n"
"Last-Translator: Jeremy Kerr <jk@ozlabs.org>\n"
"Language-Team: English\n"
msgid "(if not provided by DHCP server)"
msgstr "(if not provided by DHCP server)"
msgid "(if not provided by DHCP server)"
msgstr "(if not provided by DHCP server)"
+msgid "Selecting 'OK' will exit safe mode"
+msgstr "Selecting 'OK' will exit safe mode"
+
msgid "Petitboot System Configuration"
msgstr "Petitboot System Configuration"
msgid "Petitboot System Configuration"
msgstr "Petitboot System Configuration"
#include "nc-config.h"
#include "nc-widgets.h"
#include "nc-config.h"
#include "nc-widgets.h"
extern struct help_text config_help_text;
extern struct help_text config_help_text;
struct nc_widget_label *dns_dhcp_help_l;
struct nc_widget_label *dns_help_l;
struct nc_widget_label *dns_dhcp_help_l;
struct nc_widget_label *dns_help_l;
+ struct nc_widget_label *safe_mode;
struct nc_widget_button *ok_b;
struct nc_widget_button *help_b;
struct nc_widget_button *cancel_b;
struct nc_widget_button *ok_b;
struct nc_widget_button *help_b;
struct nc_widget_button *cancel_b;
+ config->safe_mode = false;
rc = cui_send_config(screen->cui, config);
talloc_free(config);
rc = cui_send_config(screen->cui, config);
talloc_free(config);
+ show = screen->cui->config->safe_mode;
+ if (show) {
+ widget_move(widget_label_base(screen->widgets.safe_mode),
+ y, screen->field_x);
+ y += 1;
+ }
+
widget_move(widget_button_base(screen->widgets.ok_b),
y, screen->field_x);
widget_move(widget_button_base(screen->widgets.help_b),
widget_move(widget_button_base(screen->widgets.ok_b),
y, screen->field_x);
widget_move(widget_button_base(screen->widgets.help_b),
screen->widgets.dns_dhcp_help_l = widget_new_label(set, 0, 0,
_("(if not provided by DHCP server)"));
screen->widgets.dns_dhcp_help_l = widget_new_label(set, 0, 0,
_("(if not provided by DHCP server)"));
+ if (config->safe_mode)
+ screen->widgets.safe_mode = widget_new_label(set, 0, 0,
+ _("Selecting 'OK' will exit safe mode"));
+
screen->widgets.ok_b = widget_new_button(set, 0, 0, 6, _("OK"),
ok_click, screen);
screen->widgets.help_b = widget_new_button(set, 0, 0, 6, _("Help"),
screen->widgets.ok_b = widget_new_button(set, 0, 0, 6, _("OK"),
ok_click, screen);
screen->widgets.help_b = widget_new_button(set, 0, 0, 6, _("Help"),
#include "nc-lang.h"
#include "nc-widgets.h"
#include "nc-lang.h"
#include "nc-widgets.h"
static struct lang {
const char *name;
static struct lang {
const char *name;
struct nc_widget_select *lang_f;
struct nc_widget_label *lang_l;
struct nc_widget_select *lang_f;
struct nc_widget_label *lang_l;
+ struct nc_widget_label *safe_mode;
struct nc_widget_button *ok_b;
struct nc_widget_button *cancel_b;
} widgets;
struct nc_widget_button *ok_b;
struct nc_widget_button *cancel_b;
} widgets;
config->lang = talloc_strdup(screen, lang->name);
config->lang = talloc_strdup(screen, lang->name);
+ config->safe_mode = false;
rc = cui_send_config(screen->cui, config);
talloc_free(config);
rc = cui_send_config(screen->cui, config);
talloc_free(config);
+ if (screen->cui->config->safe_mode) {
+ widget_move(widget_label_base(screen->widgets.safe_mode),
+ y, screen->field_x);
+ y += 1;
+ }
+
widget_move(widget_button_base(screen->widgets.ok_b),
y, screen->field_x);
widget_move(widget_button_base(screen->widgets.cancel_b),
widget_move(widget_button_base(screen->widgets.ok_b),
y, screen->field_x);
widget_move(widget_button_base(screen->widgets.cancel_b),
+ if (config->safe_mode)
+ screen->widgets.safe_mode = widget_new_label(set, 0, 0,
+ _("Selecting 'OK' will exit safe mode"));
+
screen->widgets.ok_b = widget_new_button(set, 0, 0, 6, _("OK"),
ok_click, screen);
screen->widgets.cancel_b = widget_new_button(set, 0, 0, 6, _("Cancel"),
screen->widgets.ok_b = widget_new_button(set, 0, 0, 6, _("OK"),
ok_click, screen);
screen->widgets.cancel_b = widget_new_button(set, 0, 0, 6, _("Cancel"),