e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Prepare to move menus in menus.cfg to simple files - continued. 

SVN revision: 30212
This commit is contained in:
Kim Woelders 2007-06-03 11:55:29 +00:00
parent 60800f3067
commit 7cc406ee84
2 changed files with 53 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/menus-misc.c
View File

@ -311,16 +311,20 @@ FillFlatFileMenu(Menu * m, const char *file)
if (first) if (first)
{ {
char *title; char *title, *style, *alias;
first = 0; first = 0;
title = NULL; title = style = alias = NULL;
parse(s, "%S", &title); parse(s, "%S%S%S", &title, &style, &alias);
if (!title) if (title)
continue; MenuSetTitle(m, title);
MenuSetTitle(m, title); if (!style)
style = (char *)"ROOT";
MenuSetStyle(m, MenuStyleFind(style));
if (alias)
MenuSetAlias(m, alias);
} }
else else
{ {

48
src/menus.c
View File

@ -278,7 +278,7 @@ MenuShow(Menu * m, char noshow)
int w, h, mw, mh; /* from appearing offscreen */ int w, h, mw, mh; /* from appearing offscreen */
int head_num = 0; int head_num = 0;
if (m->shown || !m->style) if (m->shown)
return; return;
if (MenuLoad(m)) if (MenuLoad(m))
@ -290,6 +290,9 @@ MenuShow(Menu * m, char noshow)
if (!m->win) if (!m->win)
MenuRealize(m); MenuRealize(m);
if (!m->style)
return;
ewin = m->ewin; ewin = m->ewin;
if (ewin) if (ewin)
{ {
@ -546,7 +549,8 @@ MenuCreate(const char *name, const char *title, Menu * parent, MenuStyle * ms)
m->parent = parent; m->parent = parent;
MenuSetName(m, name); MenuSetName(m, name);
MenuSetTitle(m, title); MenuSetTitle(m, title);
MenuSetStyle(m, ms); if (ms)
MenuSetStyle(m, ms);
m->icon_size = -1; /* Use image size */ m->icon_size = -1; /* Use image size */
if (!menu_list) if (!menu_list)
@ -687,7 +691,11 @@ MenuRealize(Menu * m)
char has_i, has_s; char has_i, has_s;
if (!m->style) if (!m->style)
return; {
MenuSetStyle(m, NULL);
if (!m->style)
return;
}
if (!m->win) if (!m->win)
{ {
@ -716,7 +724,7 @@ MenuRealize(Menu * m)
ESelectInput(m->items[i]->win, MENU_ITEM_EVENT_MASK); ESelectInput(m->items[i]->win, MENU_ITEM_EVENT_MASK);
EMapWindow(m->items[i]->win); EMapWindow(m->items[i]->win);
if ((m->style) && (m->style->tclass) && (m->items[i]->text)) if ((m->style->tclass) && (m->items[i]->text))
{ {
TextSize(m->style->tclass, 0, 0, 0, _(m->items[i]->text), &w, &h, TextSize(m->style->tclass, 0, 0, 0, _(m->items[i]->text), &w, &h,
17); 17);
@ -1832,6 +1840,33 @@ MenuStyleConfigLoad(FILE * ConfigFile)
return err; return err;
} }
/*
* Aliases for "well-known" menus for backward compatibility.
*/
static const char *const menu_aliases[] = {
"APPS_SUBMENU", "file.menu",
"CONFIG_SUBMENU", "settings.menu",
"DESKTOP_SUBMENU", "desktop.menu",
"MAINT_SUBMENU", "maintenance.menu",
"ROOT_2", "enlightenment.menu",
"WINOPS_MENU", "winops.menu",
};
#define N_MENU_ALIASES (sizeof(menu_aliases)/sizeof(char*)/2)
static void
_MenuCheckAlias(Menu * m)
{
unsigned int i;
for (i = 0; i < N_MENU_ALIASES; i++)
{
if (strcmp(m->name, menu_aliases[2 * i]))
continue;
MenuSetAlias(m, menu_aliases[2 * i + 1]);
break;
}
}
int int
MenuConfigLoad(FILE * fs) MenuConfigLoad(FILE * fs)
{ {
@ -1898,6 +1933,7 @@ MenuConfigLoad(FILE * fs)
m = MenuCreate(s2, NULL, NULL, NULL); m = MenuCreate(s2, NULL, NULL, NULL);
else else
MenuSetName(m, s2); MenuSetName(m, s2);
_MenuCheckAlias(m);
break; break;
case MENU_USE_STYLE: case MENU_USE_STYLE:
MenuSetStyle(m, MenuStyleFind(s2)); MenuSetStyle(m, MenuStyleFind(s2));
@ -2113,8 +2149,10 @@ MenusIpc(const char *params)
else if (!strncmp(cmd, "list", 2)) else if (!strncmp(cmd, "list", 2))
{ {
#define SS(s) ((s) ? (s) : "-") #define SS(s) ((s) ? (s) : "-")
#define ST(s) ((s) ? (s->name) : "-")
ECORE_LIST_FOR_EACH(menu_list, m) ECORE_LIST_FOR_EACH(menu_list, m)
IpcPrintf("%s(%s): %s\n", m->name, SS(m->alias), SS(m->title)); IpcPrintf("%s(%s/%s): %s\n", m->name, SS(m->alias), ST(m->style),
SS(m->title));
} }
else if (!strncmp(cmd, "reload", 2)) else if (!strncmp(cmd, "reload", 2))
{ {