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

Sun Feb 13 13:57:02 PST 2000 

(Mandrake)

allowing a # style comment in .menu files.
# MUST be the very first character however :)


SVN revision: 2065
This commit is contained in:
Mandrake 2000-02-13 21:49:11 +00:00
parent 759f1d98a9
commit 8a1b92400d
2 changed files with 84 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ChangeLog
View File

@ -4199,3 +4199,11 @@ Mon Jan 31 10:50:09 PST 2000
text compression works wiht multi-byte stuff now thanks to masahiko :)
-------------------------------------------------------------------------------
Sun Feb 13 13:57:02 PST 2000
(Mandrake)
allowing a # style comment in .menu files.
# MUST be the very first character however :)

149
src/menus.c
View File

@ -1481,93 +1481,96 @@ FillFlatFileMenu(Menu * m, MenuStyle * ms, char *name, char *file,
while (fgets(s, 4096, f))
{
s[strlen(s) - 1] = 0;
if (first)
if ((s[0]) && s[0] != '#')
{
char *wd;
wd = field(s, 0);
if (wd)
if (first)
{
AddTitleToMenu(m, wd);
Efree(wd);
}
first = 0;
}
else
{
char *txt = NULL, *icon = NULL, *act = NULL;
char *params = NULL, *tmp = NULL, wd[4096];
char *wd;
MenuItem *mi;
ImageClass *icc = NULL;
Menu *mm;
int count = 0;
txt = field(s, 0);
icon = field(s, 1);
act = field(s, 2);
params = field(s, 3);
tmp = NULL;
if (icon)
{
Esnprintf(wd, sizeof(wd), "__FM.%s", icon);
icc = FindItem(wd, 0, LIST_FINDBY_NAME, LIST_TYPE_ICLASS);
if (!icc)
wd = field(s, 0);
if (wd)
{
icc = CreateIclass();
icc->name = duplicate(wd);
icc->norm.normal = CreateImageState();
icc->norm.normal->im_file = icon;
IclassPopulate(icc);
AddItem(icc, icc->name, 0, LIST_TYPE_ICLASS);
AddTitleToMenu(m, wd);
Efree(wd);
}
first = 0;
}
else
{
char *txt = NULL, *icon = NULL, *act = NULL;
char *params = NULL, *tmp = NULL, wd[4096];
MenuItem *mi;
ImageClass *icc = NULL;
Menu *mm;
int count = 0;
txt = field(s, 0);
icon = field(s, 1);
act = field(s, 2);
params = field(s, 3);
tmp = NULL;
if (icon)
{
Esnprintf(wd, sizeof(wd), "__FM.%s", icon);
icc = FindItem(wd, 0, LIST_FINDBY_NAME, LIST_TYPE_ICLASS);
if (!icc)
{
icc = CreateIclass();
icc->name = duplicate(wd);
icc->norm.normal = CreateImageState();
icc->norm.normal->im_file = icon;
IclassPopulate(icc);
AddItem(icc, icc->name, 0, LIST_TYPE_ICLASS);
}
else
{
Efree(icon);
}
}
if ((act) && (!strcmp(act, "exec")) && (params))
{
word(params, 1, wd);
tmp = pathtoexec(wd);
if (tmp)
{
Efree(tmp);
mi = CreateMenuItem(txt, icc, ACTION_EXEC, params, NULL);
AddItemToMenu(m, mi);
if (txt)
Efree(txt);
if (params)
Efree(params);
}
}
else if ((act) && (!strcmp(act, "menu")) && (params))
{
Esnprintf(wd, sizeof(wd), "__FM.%s.%i", name, count);
count++;
mm = CreateMenuFromFlatFile(wd, ms, params, parent);
if (mm)
{
mm->parent = m;
AddItem(mm, mm->name, mm->win, LIST_TYPE_MENU);
mi = CreateMenuItem(txt, icc, 0, NULL, mm);
AddItemToMenu(m, mi);
}
if (txt)
Efree(txt);
}
else
{
Efree(icon);
}
}
if ((act) && (!strcmp(act, "exec")) && (params))
{
word(params, 1, wd);
tmp = pathtoexec(wd);
if (tmp)
{
Efree(tmp);
mi = CreateMenuItem(txt, icc, ACTION_EXEC, params, NULL);
mi = CreateMenuItem(txt, icc, 0, NULL, NULL);
AddItemToMenu(m, mi);
if (txt)
Efree(txt);
if (params)
Efree(params);
}
if (act)
Efree(act);
}
else if ((act) && (!strcmp(act, "menu")) && (params))
{
Esnprintf(wd, sizeof(wd), "__FM.%s.%i", name, count);
count++;
mm = CreateMenuFromFlatFile(wd, ms, params, parent);
if (mm)
{
mm->parent = m;
AddItem(mm, mm->name, mm->win, LIST_TYPE_MENU);
mi = CreateMenuItem(txt, icc, 0, NULL, mm);
AddItemToMenu(m, mi);
}
if (txt)
Efree(txt);
}
else
{
mi = CreateMenuItem(txt, icc, 0, NULL, NULL);
AddItemToMenu(m, mi);
if (txt)
Efree(txt);
if (params)
Efree(params);
}
if (act)
Efree(act);
}
}
fclose(f);