X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=inline;f=config%2Fmenu.c;h=826da662886daff806fd2a5dbec5aa53a0d22124;hb=38accb8265d899250a003e10f0916b8d997e2203;hp=f3bffa309333061ed5d852e7c00132107017add5;hpb=b3805f620303ab02d11d1a6df6dd589e8fcd5d39;p=carl9170fw.git diff --git a/config/menu.c b/config/menu.c index f3bffa3..826da66 100644 --- a/config/menu.c +++ b/config/menu.c @@ -515,13 +515,6 @@ static void get_prompt_str(struct gstr *r, struct property *prop, struct jump_key *jump; str_printf(r, _("Prompt: %s\n"), _(prop->text)); - str_printf(r, _(" Defined at %s:%d\n"), prop->menu->file->name, - prop->menu->lineno); - if (!expr_is_yes(prop->visible.expr)) { - str_append(r, _(" Depends on: ")); - expr_gstr_print(prop->visible.expr, r); - str_append(r, "\n"); - } menu = prop->menu->parent; for (i = 0; menu != &rootmenu && i < 8; menu = menu->parent) { bool accessible = menu_is_visible(menu); @@ -571,6 +564,18 @@ static void get_prompt_str(struct gstr *r, struct property *prop, } } +/* + * get peoperty of type P_SYMBOL + */ +static struct property *get_symbol_prop(struct symbol *sym) +{ + struct property *prop = NULL; + + for_all_properties(sym, prop, P_SYMBOL) + break; + return prop; +} + /* * head is optional and may be NULL */ @@ -595,6 +600,14 @@ void get_symbol_str(struct gstr *r, struct symbol *sym, } for_all_prompts(sym, prop) get_prompt_str(r, prop, head); + prop = get_symbol_prop(sym); + str_printf(r, _(" Defined at %s:%d\n"), prop->menu->file->name, + prop->menu->lineno); + if (!expr_is_yes(prop->visible.expr)) { + str_append(r, _(" Depends on: ")); + expr_gstr_print(prop->visible.expr, r); + str_append(r, "\n"); + } hit = false; for_all_properties(sym, prop, P_SELECT) { if (!hit) {