ui/ncurses: Expand cancel & help button width

Signed-off-by: Samuel Mendoza-Jonas <sam.mj@au1.ibm.com>

diff --git a/ui/ncurses/nc-add-url.c b/ui/ncurses/nc-add-url.c
index b1a31dd391cff155ee13707027187662543d774b..f8273a29ace0ac9177bc103820f85c24f05e08f2 100644 (file)
--- a/ui/ncurses/nc-add-url.c
+++ b/ui/ncurses/nc-add-url.c
@@ -191,7 +191,7 @@ static void add_url_screen_layout_widgets(struct add_url_screen *screen)
        widget_move(widget_button_base(screen->widgets.help_b),
                y, screen->field_x + 10);
        widget_move(widget_button_base(screen->widgets.cancel_b),
        widget_move(widget_button_base(screen->widgets.help_b),
                y, screen->field_x + 10);
        widget_move(widget_button_base(screen->widgets.cancel_b),

-               y, screen->field_x + 20);
+               y, screen->field_x + 23);

 }
 
 static void add_url_screen_setup_widgets(struct add_url_screen *screen)
 }
 
 static void add_url_screen_setup_widgets(struct add_url_screen *screen)


@@ -207,9 +207,9 @@ static void add_url_screen_setup_widgets(struct add_url_screen *screen)
 
        screen->widgets.ok_b = widget_new_button(set, 0, 0, 6, _("OK"),
                        ok_click, screen);
 
        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.help_b = widget_new_button(set, 0, 0, 9, _("Help"),

                        help_click, screen);
                        help_click, screen);

-       screen->widgets.cancel_b = widget_new_button(set, 0, 0, 6, _("Cancel"),
+       screen->widgets.cancel_b = widget_new_button(set, 0, 0, 9, _("Cancel"),

                        cancel_click, screen);
 }
 
                        cancel_click, screen);
 }
 

diff --git a/ui/ncurses/nc-boot-editor.c b/ui/ncurses/nc-boot-editor.c
index 6da36302f49641ba52c666c7fb75071b0088d3d5..3d4621b3db75baddda777537179493a524faa131 100644 (file)
--- a/ui/ncurses/nc-boot-editor.c
+++ b/ui/ncurses/nc-boot-editor.c
@@ -305,7 +305,7 @@ static void boot_editor_layout_widgets(struct boot_editor *boot_editor)
        y++;
        widget_move(widget_button_base(boot_editor->widgets.ok_b), y, 9);
        widget_move(widget_button_base(boot_editor->widgets.help_b), y, 19);
        y++;
        widget_move(widget_button_base(boot_editor->widgets.ok_b), y, 9);
        widget_move(widget_button_base(boot_editor->widgets.help_b), y, 19);

-       widget_move(widget_button_base(boot_editor->widgets.cancel_b), y, 29);
+       widget_move(widget_button_base(boot_editor->widgets.cancel_b), y, 32);

 }
 
 static void boot_editor_widget_focus(struct nc_widget *widget, void *arg)
 }
 
 static void boot_editor_widget_focus(struct nc_widget *widget, void *arg)


@@ -478,9 +478,9 @@ static void boot_editor_setup_widgets(struct boot_editor *boot_editor,
 
        boot_editor->widgets.ok_b = widget_new_button(set, 0, 0, 6,
                                        _("OK"), ok_click, boot_editor);
 
        boot_editor->widgets.ok_b = widget_new_button(set, 0, 0, 6,
                                        _("OK"), ok_click, boot_editor);

-       boot_editor->widgets.help_b = widget_new_button(set, 0, 0, 6,
+       boot_editor->widgets.help_b = widget_new_button(set, 0, 0, 9,

                                        _("Help"), help_click, boot_editor);
                                        _("Help"), help_click, boot_editor);

-       boot_editor->widgets.cancel_b = widget_new_button(set, 0, 0, 6,
+       boot_editor->widgets.cancel_b = widget_new_button(set, 0, 0, 9,

                                        _("Cancel"), cancel_click, boot_editor);
 }
 
                                        _("Cancel"), cancel_click, boot_editor);
 }
 

diff --git a/ui/ncurses/nc-config.c b/ui/ncurses/nc-config.c
index f6d544de3505f2cabf63636e428a1aafb8e951e8..d1918a718378efc4965f39b7c5570d2c41f6b6c1 100644 (file)
--- a/ui/ncurses/nc-config.c
+++ b/ui/ncurses/nc-config.c
@@ -483,7 +483,7 @@ static void config_screen_layout_widgets(struct config_screen *screen)
        widget_move(widget_button_base(screen->widgets.help_b),
                        y, screen->field_x + 10);
        widget_move(widget_button_base(screen->widgets.cancel_b),
        widget_move(widget_button_base(screen->widgets.help_b),
                        y, screen->field_x + 10);
        widget_move(widget_button_base(screen->widgets.cancel_b),

-                       y, screen->field_x + 20);
+                       y, screen->field_x + 23);

 }
 
 static void config_screen_network_change(void *arg, int value)
 }
 
 static void config_screen_network_change(void *arg, int value)


@@ -541,7 +541,7 @@ 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,
        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"),
+                       4, screen->field_x, 9, _("Cancel"),

                        cancel_click, screen);
 }
 
                        cancel_click, screen);
 }
 


@@ -744,9 +744,9 @@ static void config_screen_setup_widgets(struct config_screen *screen,
 
        screen->widgets.ok_b = widget_new_button(set, 0, 0, 6, _("OK"),
                        ok_click, screen);
 
        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.help_b = widget_new_button(set, 0, 0, 9, _("Help"),

                        help_click, screen);
                        help_click, screen);

-       screen->widgets.cancel_b = widget_new_button(set, 0, 0, 6, _("Cancel"),
+       screen->widgets.cancel_b = widget_new_button(set, 0, 0, 9, _("Cancel"),

                        cancel_click, screen);
 }
 
                        cancel_click, screen);
 }
 

diff --git a/ui/ncurses/nc-lang.c b/ui/ncurses/nc-lang.c
index dee129074ac752a547026625e00c9a3cc312a9de..0da7b9dcbc8b9c29f94de0288dcf2aca4791a1b1 100644 (file)
--- a/ui/ncurses/nc-lang.c
+++ b/ui/ncurses/nc-lang.c
@@ -238,7 +238,7 @@ static void lang_screen_setup_empty(struct lang_screen *screen)
        widget_new_label(screen->widgetset, 2, screen->field_x,
                        _("Waiting for configuration data..."));
        screen->widgets.cancel_b = widget_new_button(screen->widgetset,
        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"),
+                       4, screen->field_x, 9, _("Cancel"),

                        cancel_click, screen);
 }
 
                        cancel_click, screen);
 }
 


@@ -289,7 +289,7 @@ static void lang_screen_setup_widgets(struct lang_screen *screen,
 
        screen->widgets.ok_b = widget_new_button(set, 0, 0, 6, _("OK"),
                        ok_click, screen);
 
        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.cancel_b = widget_new_button(set, 0, 0, 9, _("Cancel"),

                        cancel_click, screen);
 }
 
                        cancel_click, screen);
 }