X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ui%2Fncurses%2Fnc-config.c;h=76ede39905755b5cc9d747a5bc673e1a4ce02b8b;hb=dcc406653405c0b97c9474d99a66ac896557734c;hp=911559dcefc0240c283b9ceea6ba6c4ddeee048b;hpb=a1b17961420c2d95a62d9003b75431f706e96753;p=petitboot

diff --git a/ui/ncurses/nc-config.c b/ui/ncurses/nc-config.c
index 911559d..76ede39 100644
--- a/ui/ncurses/nc-config.c
+++ b/ui/ncurses/nc-config.c
@@ -383,11 +383,11 @@ static void config_screen_layout_widgets(struct config_screen *screen)
 	bool show;
 
 	y = 1;
+	/* currently, the longest label we have is the DNS-servers
+	 * widget, so layout our screen based on that */
 	help_x = screen->field_x + 2 +
 		widget_width(widget_textbox_base(screen->widgets.dns_f));
 
-	y += 1;
-
 	wl = widget_label_base(screen->widgets.boot_order_l);
 	widget_set_visible(wl, true);
 	widget_move(wl, y, screen->label_x);
@@ -412,9 +412,9 @@ static void config_screen_layout_widgets(struct config_screen *screen)
 	widget_move(widget_button_base(screen->widgets.boot_add_b),
 			y, screen->field_x);
 	widget_move(widget_button_base(screen->widgets.boot_any_b),
-			y, screen->field_x + 12);
+			y, screen->field_x + 14);
 	widget_move(widget_button_base(screen->widgets.boot_none_b),
-			y, screen->field_x + 30);
+			y, screen->field_x + 34);
 
 	wf = widget_button_base(screen->widgets.boot_add_b);
 	if (widget_subset_n_inactive(screen->widgets.boot_order_f))
@@ -453,7 +453,7 @@ static void config_screen_layout_widgets(struct config_screen *screen)
 		y += 1;
 	}
 
-	y += 2;
+	y += 1;
 
 	y += layout_pair(screen, y, screen->widgets.network_l,
 			widget_select_base(screen->widgets.network_f));
@@ -571,7 +571,7 @@ static void config_screen_add_device(void *arg)
 	struct config_screen *screen = arg;
 
 	screen->show_subset = true;
-	cui_show_subset(screen->cui, _("Select an option"),
+	cui_show_subset(screen->cui, _("Select a boot device to add"),
 			screen->widgets.boot_order_f);
 }
 
@@ -704,19 +704,19 @@ static void config_screen_setup_widgets(struct config_screen *screen,
 	ifcfg = first_active_interface(config);
 
 	screen->widgets.boot_add_b = widget_new_button(set, 0, 0, 10,
-					_("Add Device"), config_screen_add_device,
-					screen);
+					_("Add Device"),
+					config_screen_add_device, screen);
 
 	screen->widgets.boot_none_b = widget_new_button(set, 0, 0, 10,
 					_("Clear"),
 					config_screen_autoboot_none, screen);
 
 	screen->widgets.boot_any_b = widget_new_button(set, 0, 0, 16,
-					_("Clear & Boot Any"), config_screen_autoboot_any,
-					screen);
+					_("Clear & Boot Any"),
+					config_screen_autoboot_any, screen);
 
 	screen->widgets.boot_order_l = widget_new_label(set, 0, 0,
-					_("Boot order:"));
+					_("Boot Order:"));
 	screen->widgets.boot_order_f = widget_new_subset(set, 0, 0,
 					COLS - screen->field_x,
 					config_screen_update_subset);