ui/ncurses: Properly size cancel and help buttons

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 c0f08f211789d7a3bc2fc6b24dc020bbdb976ce0..386d813264af64e25a257b3a30b5db33f2061744 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 + 23);
+               y, screen->field_x + 24);

 }
 
 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, 9, _("Help"),
+       screen->widgets.help_b = widget_new_button(set, 0, 0, 10, _("Help"),

                        help_click, screen);
                        help_click, screen);

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

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

diff --git a/ui/ncurses/nc-config.c b/ui/ncurses/nc-config.c
index d1918a718378efc4965f39b7c5570d2c41f6b6c1..551b9d262666bcb078b8aea21d6a5d43963df48a 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 + 23);
+                       y, screen->field_x + 24);

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


@@ -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, 9, _("Help"),
+       screen->widgets.help_b = widget_new_button(set, 0, 0, 10, _("Help"),

                        help_click, screen);
                        help_click, screen);

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

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

diff --git a/ui/ncurses/nc-lang.c b/ui/ncurses/nc-lang.c
index 0da7b9dcbc8b9c29f94de0288dcf2aca4791a1b1..0422ebba7531e4a2cd7db87b5319c708f7084b99 100644 (file)
--- a/ui/ncurses/nc-lang.c
+++ b/ui/ncurses/nc-lang.c
@@ -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, 9, _("Cancel"),
+       screen->widgets.cancel_b = widget_new_button(set, 0, 0, 10, _("Cancel"),

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