return NET_CONF_TYPE_DHCP_ALL;
}
+static void config_screen_setup_empty(struct config_screen *screen)
+{
+ widget_new_label(screen->widgetset, 2, screen->field_x,
+ "Waiting for configuration data...");
+ screen->widgets.cancel_b = widget_new_button(screen->widgetset,
+ 4, screen->field_x, 6, "Cancel", cancel_click, screen);
+}
+
+
static void config_screen_setup_widgets(struct config_screen *screen,
const struct config *config,
const struct system_info *sysinfo)
cancel_click, screen);
}
+void config_screen_update(struct config_screen *screen,
+ const struct config *config,
+ const struct system_info *sysinfo)
+{
+ bool repost = false;
+
+ if (screen->widgetset) {
+ widgetset_unpost(screen->widgetset);
+ talloc_free(screen->widgetset);
+ repost = true;
+ }
+
+ screen->widgetset = widgetset_create(screen, screen->scr.main_ncw,
+ screen->scr.sub_ncw);
+
+ if (!config || !sysinfo) {
+ config_screen_setup_empty(screen);
+ } else {
+ screen->net_conf_type = find_net_conf_type(config);
+
+ config_screen_setup_widgets(screen, config, sysinfo);
+ config_screen_layout_widgets(screen, screen->net_conf_type);
+ }
+
+ if (repost)
+ widgetset_post(screen->widgetset);
+
+ wrefresh(screen->scr.main_ncw);
+}
+
struct config_screen *config_screen_init(struct cui *cui,
const struct config *config,
const struct system_info *sysinfo,
"tab=next, shift+tab=previous");
nc_scr_frame_draw(&screen->scr);
- screen->widgetset = widgetset_create(screen, screen->scr.main_ncw,
- screen->scr.sub_ncw);
- screen->net_conf_type = find_net_conf_type(config);
-
- config_screen_setup_widgets(screen, config, sysinfo);
- config_screen_layout_widgets(screen, screen->net_conf_type);
-
- wrefresh(screen->scr.main_ncw);
scrollok(screen->scr.sub_ncw, true);
+ config_screen_update(screen, config, sysinfo);
+
return screen;
}
if (cui->sysinfo_screen)
sysinfo_screen_update(cui->sysinfo_screen, sysinfo);
+ /* ... and do the same with the config screen */
+ if (cui->config_screen)
+ config_screen_update(cui->config_screen, cui->config, sysinfo);
+
cui_update_mm_title(cui);
}
{
struct cui *cui = cui_from_arg(arg);
cui->config = talloc_steal(cui, config);
+
+ if (cui->config_screen)
+ config_screen_update(cui->config_screen, config, cui->sysinfo);
}
int cui_send_config(struct cui *cui, struct config *config)