enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

support menus to select in ~/.config/menus 

SVN revision: 59336
This commit is contained in:
Carsten Haitzler 2011-05-12 03:02:55 +00:00
parent d83c6c2d6c
commit 2dd6734aa9
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/modules/conf_menus/e_int_config_menus.c
View File

@ -120,8 +120,11 @@ get_menus(Eina_List **menus)
};
int i, newdir;
for (i = 0; dirs[i]; i++)
check_menu_dir(dirs[i], menus);
e_user_homedir_concat(buf, sizeof(buf), ".config");
check_menu_dir(buf, menus);
for (i = 0; dirs[i]; i++) check_menu_dir(dirs[i], menus);
newdir = 1;
snprintf(buf, sizeof(buf), "%s/etc/xdg", e_prefix_get());
for (i = 0; dirs[i]; i++)
@ -157,11 +160,21 @@ _create_menus_list(Evas *evas, E_Config_Dialog_Data *cfdata)
label = file;
tlabel = NULL;
tdesc = NULL;
e_user_homedir_concat(buf, sizeof(buf),
".config/menus/applications.menu");
if (!strcmp("/etc/xdg/menus/applications.menu", file))
{
label = _("System Default");
if (!cfdata->default_system_menu) sel = i;
}
else if (!strcmp(buf, file))
{
label = _("Personal Default");
if (cfdata->default_system_menu)
{
if (!strcmp(cfdata->default_system_menu, file)) sel = i;
}
}
else
{
p = strrchr(file, '/');

17
src/modules/wizard/page_030.c
View File

@ -44,8 +44,11 @@ wizard_page_init(E_Wizard_Page *pg __UNUSED__)
};
int i, newdir;
for (i = 0; dirs[i]; i++)
check_menu_dir(dirs[i]);
e_user_homedir_concat(buf, sizeof(buf), ".config");
check_menu_dir(buf);
for (i = 0; dirs[i]; i++) check_menu_dir(dirs[i]);
newdir = 1;
snprintf(buf, sizeof(buf), "%s/etc/xdg", e_prefix_get());
for (i = 0; dirs[i]; i++)
@ -116,12 +119,18 @@ wizard_page_show(E_Wizard_Page *pg)
label = file;
tlabel = NULL;
tdesc = NULL;
if (!strcmp("/etc/xdg/menus/applications.menu", file))
e_user_homedir_concat(buf, sizeof(buf),
".config/menus/applications.menu");
if (!strcmp("/etc/xdg/menus/applications.menu", file))
{
label = _("System Default");
sel = i;
}
else
else if (!strcmp(buf, file))
{
label = _("Personal Default");
}
else
{
p = strrchr(file, '/');
if (p)