| Message ID | 20121201161316.GA15246@udknight (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Wang, All, On Saturday 01 December 2012 Wang YanQing wrote: > If menuconfig have a Save button like alternative > .config editors, xconfig, nconfig, etc.We will have > a obvious benefit when use menuconfig just like > when we use others, we can save our .config quickly > and conveniently. > > This patch add the Save button for menuconfig. To make the behavior consistent, may I suggest that you push the concept even a bit further: - add a "Load" *and* a "Save" buttons - get rid of the top-level "Load an Alternate Configuration File" and "Save an Alternate Configuration File" entries For the "Save" and "Load" buttons, please mimick how the nconf frontend behaves: prompt for the file to save to/load from, and prefill it with the last filename that was entered (".config" per default). Of course, two patches for that: one for the "Save/Load" buttons, one to get rid of the top-level entries afterward. Note: I do not state that your use-case is valid or not. That's your call how you configure and test your kernel. However, I think that having a consistent behavior across the frontends is a very nice goal to pursue. See other comments in-lined, below. > V1-V2: Rewrite the most code to make it more correct > V2-V3: Fix the behavior of conf_message_callback when exit. > V3-V4: > 1: Move Buttons a little left to make them look like symmetrical. > 2: Exchange the position between Save button and Exit button. > 3: Use conf_save instead of conf_write to make we can save > an alternate configuration file with Save button. > > Signed-off-by: Wang YanQing <udknight@gmail.com> > --- > scripts/kconfig/lxdialog/menubox.c | 21 +++++++++--------- > scripts/kconfig/mconf.c | 45 ++++++++++++++++++++++++++++++-------- > 2 files changed, 47 insertions(+), 19 deletions(-) > > diff --git a/scripts/kconfig/lxdialog/menubox.c b/scripts/kconfig/lxdialog/menubox.c > index 1d60473..b445bda 100644 > --- a/scripts/kconfig/lxdialog/menubox.c > +++ b/scripts/kconfig/lxdialog/menubox.c > @@ -26,7 +26,7 @@ > * > * *) A bugfix for the Page-Down problem > * > - * *) Formerly when I used Page Down and Page Up, the cursor would be set > + * *) Formerly when I used Page Down and Page Up, the cursor would be set Space-damage. Don't send trailing-space fixes, or at least add a quick note for it at the end of the commit log (eg.: "remove trailing space while at it"). > * to the first position in the menu box. Now lxdialog is a bit > * smarter and works more like other menu systems (just have a look at > * it). > @@ -154,12 +154,13 @@ static void print_arrows(WINDOW * win, int item_no, int scroll, int y, int x, > */ > static void print_buttons(WINDOW * win, int height, int width, int selected) > { > - int x = width / 2 - 16; > + int x = width / 2 - 20; > int y = height - 2; > > print_button(win, gettext("Select"), y, x, selected == 0); > - print_button(win, gettext(" Exit "), y, x + 12, selected == 1); > + print_button(win, gettext(" Save "), y, x + 12, selected == 1); > print_button(win, gettext(" Help "), y, x + 24, selected == 2); > + print_button(win, gettext(" Exit "), y, x + 36, selected == 3); The re-ordering should be in a separate patch. It makes it difficult to separate the code for the new feature from the churn due to the re-ordering. Regards, Yann E. MORIN.
Hi Yann, All, On Sun, Dec 02, 2012 at 06:52:50PM +0100, Yann E. MORIN wrote: > To make the behavior consistent, may I suggest that you push the > concept even a bit further: > - add a "Load" *and* a "Save" buttons > - get rid of the top-level "Load an Alternate Configuration File" > and "Save an Alternate Configuration File" entries > > For the "Save" and "Load" buttons, please mimick how the nconf frontend > behaves: prompt for the file to save to/load from, and prefill it with > the last filename that was entered (".config" per default). > > Of course, two patches for that: one for the "Save/Load" buttons, one > to get rid of the top-level entries afterward. Thanks, very good suggestion, I will jump in. > Note: I do not state that your use-case is valid or not. That's your > call how you configure and test your kernel. However, I think that > having a consistent behavior across the frontends is a very nice goal > to pursue. I understand, I make a mistake in the comment in previous Email. > See other comments in-lined, below. > > > V1-V2: Rewrite the most code to make it more correct > > V2-V3: Fix the behavior of conf_message_callback when exit. > > V3-V4: > > 1: Move Buttons a little left to make them look like symmetrical. > > 2: Exchange the position between Save button and Exit button. > > 3: Use conf_save instead of conf_write to make we can save > > an alternate configuration file with Save button. > > > > Signed-off-by: Wang YanQing <udknight@gmail.com> > > --- > > scripts/kconfig/lxdialog/menubox.c | 21 +++++++++--------- > > scripts/kconfig/mconf.c | 45 ++++++++++++++++++++++++++++++-------- > > 2 files changed, 47 insertions(+), 19 deletions(-) > > > > diff --git a/scripts/kconfig/lxdialog/menubox.c b/scripts/kconfig/lxdialog/menubox.c > > index 1d60473..b445bda 100644 > > --- a/scripts/kconfig/lxdialog/menubox.c > > +++ b/scripts/kconfig/lxdialog/menubox.c > > @@ -26,7 +26,7 @@ > > * > > * *) A bugfix for the Page-Down problem > > * > > - * *) Formerly when I used Page Down and Page Up, the cursor would be set > > + * *) Formerly when I used Page Down and Page Up, the cursor would be set > > Space-damage. Don't send trailing-space fixes, or at least add a quick > note for it at the end of the commit log (eg.: "remove trailing space > while at it"). Ok, it is right. Thanks Yann E. MORIN, and All -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/scripts/kconfig/lxdialog/menubox.c b/scripts/kconfig/lxdialog/menubox.c index 1d60473..b445bda 100644 --- a/scripts/kconfig/lxdialog/menubox.c +++ b/scripts/kconfig/lxdialog/menubox.c @@ -26,7 +26,7 @@ * * *) A bugfix for the Page-Down problem * - * *) Formerly when I used Page Down and Page Up, the cursor would be set + * *) Formerly when I used Page Down and Page Up, the cursor would be set * to the first position in the menu box. Now lxdialog is a bit * smarter and works more like other menu systems (just have a look at * it). @@ -154,12 +154,13 @@ static void print_arrows(WINDOW * win, int item_no, int scroll, int y, int x, */ static void print_buttons(WINDOW * win, int height, int width, int selected) { - int x = width / 2 - 16; + int x = width / 2 - 20; int y = height - 2; print_button(win, gettext("Select"), y, x, selected == 0); - print_button(win, gettext(" Exit "), y, x + 12, selected == 1); + print_button(win, gettext(" Save "), y, x + 12, selected == 1); print_button(win, gettext(" Help "), y, x + 24, selected == 2); + print_button(win, gettext(" Exit "), y, x + 36, selected == 3); wmove(win, y, x + 1 + 12 * selected); wrefresh(win); @@ -372,7 +373,7 @@ do_resize: case TAB: case KEY_RIGHT: button = ((key == KEY_LEFT ? --button : ++button) < 0) - ? 2 : (button > 2 ? 0 : button); + ? 3 : (button > 3 ? 0 : button); print_buttons(dialog, height, width, button); wrefresh(menu); @@ -399,17 +400,17 @@ do_resize: return 2; case 's': case 'y': - return 3; - case 'n': return 4; - case 'm': + case 'n': return 5; - case ' ': + case 'm': return 6; - case '/': + case ' ': return 7; - case 'z': + case '/': return 8; + case 'z': + return 9; case '\n': return button; } diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c index 53975cf..a8a1947 100644 --- a/scripts/kconfig/mconf.c +++ b/scripts/kconfig/mconf.c @@ -280,6 +280,7 @@ static struct menu *current_menu; static int child_count; static int single_menu_mode; static int show_all_options; +static int save_and_exit; static void conf(struct menu *menu, struct menu *active_menu); static void conf_choice(struct menu *menu); @@ -584,6 +585,7 @@ static void conf(struct menu *menu, struct menu *active_menu) const char *prompt = menu_get_prompt(menu); struct symbol *sym; int res; + int yesno; int s_scroll = 0; while (1) { @@ -604,7 +606,7 @@ static void conf(struct menu *menu, struct menu *active_menu) res = dialog_menu(prompt ? _(prompt) : _("Main Menu"), _(menu_instructions), active_menu, &s_scroll); - if (res == 1 || res == KEY_ESC || res == -ERRDISPLAYTOOSMALL) + if (res == 3 || res == KEY_ESC || res == -ERRDISPLAYTOOSMALL) break; if (!item_activate_selected()) continue; @@ -644,13 +646,27 @@ static void conf(struct menu *menu, struct menu *active_menu) break; } break; + case 1: + if (!conf_get_changed()) { + break; + } + + yesno = dialog_yesno(NULL, + _("Do you wish to save your " + "new configuration?\n" + "<ESC><ESC> to continue."), + 6, 60); + if (yesno == 0) { + conf_save(); + } + break; case 2: if (sym) show_help(submenu); else show_helptext(_("README"), _(mconf_readme)); break; - case 3: + case 4: if (item_is_tag('t')) { if (sym_set_tristate_value(sym, yes)) break; @@ -658,24 +674,24 @@ static void conf(struct menu *menu, struct menu *active_menu) show_textbox(NULL, setmod_text, 6, 74); } break; - case 4: + case 5: if (item_is_tag('t')) sym_set_tristate_value(sym, no); break; - case 5: + case 6: if (item_is_tag('t')) sym_set_tristate_value(sym, mod); break; - case 6: + case 7: if (item_is_tag('t')) sym_toggle_tristate_value(sym); else if (item_is_tag('m')) conf(submenu, NULL); break; - case 7: + case 8: search_conf(); break; - case 8: + case 9: show_all_options = !show_all_options; break; } @@ -702,6 +718,17 @@ static void show_helptext(const char *title, const char *text) show_textbox(title, text, 0, 0); } +static void conf_message_callback(const char *fmt, va_list ap) +{ + char buf[1024]; + + vsnprintf(buf, sizeof(buf), fmt, ap); + if (save_and_exit) + printf("%s", buf); + else + show_textbox(NULL, buf, 6, 60); +} + static void show_help(struct menu *menu) { struct gstr help = str_new(); @@ -869,7 +896,7 @@ static void conf_save(void) static int handle_exit(void) { int res; - + save_and_exit = 1; dialog_clear(); if (conf_get_changed()) res = dialog_yesno(NULL, @@ -941,6 +968,7 @@ int main(int ac, char **av) } set_config_filename(conf_get_configname()); + conf_set_message_callback(conf_message_callback); do { conf(&rootmenu, NULL); res = handle_exit(); @@ -948,4 +976,3 @@ int main(int ac, char **av) return res; } -
If menuconfig have a Save button like alternative .config editors, xconfig, nconfig, etc.We will have a obvious benefit when use menuconfig just like when we use others, we can save our .config quickly and conveniently. This patch add the Save button for menuconfig. V1-V2: Rewrite the most code to make it more correct V2-V3: Fix the behavior of conf_message_callback when exit. V3-V4: 1: Move Buttons a little left to make them look like symmetrical. 2: Exchange the position between Save button and Exit button. 3: Use conf_save instead of conf_write to make we can save an alternate configuration file with Save button. Signed-off-by: Wang YanQing <udknight@gmail.com> --- scripts/kconfig/lxdialog/menubox.c | 21 +++++++++--------- scripts/kconfig/mconf.c | 45 ++++++++++++++++++++++++++++++-------- 2 files changed, 47 insertions(+), 19 deletions(-)