ui/ncurses: remove boot_editor_attr_field

[petitboot] / ui / ncurses / nc-boot-editor.h

diff --git a/ui/ncurses/nc-boot-editor.h b/ui/ncurses/nc-boot-editor.h
index dc849b3d9354f1bbfbdf089d9b051d106fc6ea90..6b72f253bccfa82ceba150f07e9938e6a7e27db2 100644 (file)
--- a/ui/ncurses/nc-boot-editor.h
+++ b/ui/ncurses/nc-boot-editor.h
@@ -34,11 +34,6 @@
 #include "ui/common/ui-system.h"
 #include "nc-scr.h"
 
-enum boot_editor_attr_field {
-       boot_editor_attr_field_normal = A_NORMAL,
-       boot_editor_attr_field_selected = A_REVERSE,
-};
-
 enum boot_editor_attr_cursor {
        boot_editor_attr_cursor_ins = A_NORMAL,
        boot_editor_attr_cursor_ovl = A_NORMAL | A_UNDERLINE,
@@ -61,15 +56,26 @@ enum boot_editor_result {
 
 struct boot_editor {
        struct nc_scr   scr;
-       FORM            *ncf;
-       FIELD           **fields;
-       FIELD           *button_ok, *button_cancel;
        void            *data;
        struct pmenu    *original_pmenu;
        void            (*on_exit)(struct boot_editor *boot_editor,
                                        enum boot_editor_result result,
                                        struct pb_boot_data *bd);
        enum boot_editor_attr_cursor attr_cursor;
+
+       struct nc_widgetset     *widgetset;
+       struct {
+               struct nc_widget_label          *image_l;
+               struct nc_widget_textbox        *image_f;
+               struct nc_widget_label          *initrd_l;
+               struct nc_widget_textbox        *initrd_f;
+               struct nc_widget_label          *dtb_l;
+               struct nc_widget_textbox        *dtb_f;
+               struct nc_widget_label          *args_l;
+               struct nc_widget_textbox        *args_f;
+               struct nc_widget_button         *ok_b;
+               struct nc_widget_button         *cancel_b;
+       } widgets;
 };
 
 struct boot_editor *boot_editor_init(struct pmenu *menu,