styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

only show parent directory for desktop icon menus if going to the parent directory is allowed 

SVN revision: 76657
This commit is contained in:
Mike Blumenkrantz 2012-09-14 10:25:30 +00:00
parent 4c9de587c9
commit 1477628c13
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/modules/fileman/e_fwin.c
View File

@ -1951,8 +1951,9 @@ _e_fwin_menu_extend(void *data,
{
E_Menu_Item *mi;
Efreet_Desktop *tdesktop;
E_Fwin_Page *page = data;
if (e_fm2_has_parent_get(obj))
if (((!page->fwin->zone) || fileman_config->view.desktop_navigation) && e_fm2_has_parent_get(obj))
{
mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1);
@ -1965,23 +1966,20 @@ _e_fwin_menu_extend(void *data,
"e/fileman/default/button/parent");
e_menu_item_callback_set(mi, _e_fwin_parent, obj);
}
tdesktop = e_util_terminal_desktop_get();
if (tdesktop)
if (!tdesktop) return;
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Open Terminal Here"));
e_menu_item_callback_set(mi, _e_fwin_terminal, page->fwin);
if (tdesktop->icon)
{
E_Fwin_Page *page = data;
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Open Terminal Here"));
e_menu_item_callback_set(mi, _e_fwin_terminal, page->fwin);
if (tdesktop->icon)
{
if (tdesktop->icon[0] == '/')
e_menu_item_icon_file_set(mi, tdesktop->icon);
else
e_util_menu_item_theme_icon_set(mi, tdesktop->icon);
}
efreet_desktop_free(tdesktop);
if (tdesktop->icon[0] == '/')
e_menu_item_icon_file_set(mi, tdesktop->icon);
else
e_util_menu_item_theme_icon_set(mi, tdesktop->icon);
}
efreet_desktop_free(tdesktop);
/* FIXME: if info != null then check mime type and offer options based
* on that
*/