forked from enlightenment/enlightenment
rename E_FM2_MENU_NO_NEW_DIRECTORY -> E_FM2_MENU_NO_NEW, disable New menu in sidebar
ticket #1472 SVN revision: 76382
This commit is contained in:
parent
08b692ed69
commit
c15989c37f
|
@ -8158,17 +8158,21 @@ _e_fm2_menu(Evas_Object *obj, unsigned int timestamp)
|
||||||
e_util_menu_item_theme_icon_set(mi, "view-refresh");
|
e_util_menu_item_theme_icon_set(mi, "view-refresh");
|
||||||
e_menu_item_callback_set(mi, _e_fm2_refresh, sd);
|
e_menu_item_callback_set(mi, _e_fm2_refresh, sd);
|
||||||
}
|
}
|
||||||
mi = e_menu_item_new(mn);
|
|
||||||
e_menu_item_separator_set(mi, 1);
|
|
||||||
|
|
||||||
mi = e_menu_item_new(mn);
|
if (!(sd->icon_menu.flags & E_FM2_MENU_NO_NEW))
|
||||||
e_menu_item_label_set(mi, _("New..."));
|
{
|
||||||
e_util_menu_item_theme_icon_set(mi, "add");
|
mi = e_menu_item_new(mn);
|
||||||
sub = e_menu_new();
|
e_menu_item_separator_set(mi, 1);
|
||||||
e_menu_item_submenu_set(mi, sub);
|
|
||||||
e_object_unref(E_OBJECT(sub));
|
mi = e_menu_item_new(mn);
|
||||||
e_object_data_set(E_OBJECT(sub), sd);
|
e_menu_item_label_set(mi, _("New..."));
|
||||||
e_menu_pre_activate_callback_set(sub, _e_fm2_add_menu_pre, sd);
|
e_util_menu_item_theme_icon_set(mi, "add");
|
||||||
|
sub = e_menu_new();
|
||||||
|
e_menu_item_submenu_set(mi, sub);
|
||||||
|
e_object_unref(E_OBJECT(sub));
|
||||||
|
e_object_data_set(E_OBJECT(sub), sd);
|
||||||
|
e_menu_pre_activate_callback_set(sub, _e_fm2_add_menu_pre, sd);
|
||||||
|
}
|
||||||
|
|
||||||
if (((!(sd->icon_menu.flags & E_FM2_MENU_NO_PASTE)) ||
|
if (((!(sd->icon_menu.flags & E_FM2_MENU_NO_PASTE)) ||
|
||||||
(!(sd->icon_menu.flags & E_FM2_MENU_NO_SYMLINK))) &&
|
(!(sd->icon_menu.flags & E_FM2_MENU_NO_SYMLINK))) &&
|
||||||
|
@ -8293,7 +8297,7 @@ _e_fm2_icon_menu(E_Fm2_Icon *ic, Evas_Object *obj, unsigned int timestamp)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* FIXME: stat the dir itself - move to e_fm_main */
|
/* FIXME: stat the dir itself - move to e_fm_main */
|
||||||
if (ecore_file_can_write(sd->realpath))
|
if (ecore_file_can_write(sd->realpath) && !(sd->icon_menu.flags & E_FM2_MENU_NO_NEW))
|
||||||
{
|
{
|
||||||
mi = e_menu_item_new(mn);
|
mi = e_menu_item_new(mn);
|
||||||
e_menu_item_separator_set(mi, 1);
|
e_menu_item_separator_set(mi, 1);
|
||||||
|
@ -8933,13 +8937,10 @@ _e_fm2_add_menu_pre(void *data, E_Menu *subm)
|
||||||
sd = data;
|
sd = data;
|
||||||
if (subm->items) return;
|
if (subm->items) return;
|
||||||
|
|
||||||
if (!(sd->icon_menu.flags & E_FM2_MENU_NO_NEW_DIRECTORY))
|
mi = e_menu_item_new(subm);
|
||||||
{
|
e_menu_item_label_set(mi, _("Directory"));
|
||||||
mi = e_menu_item_new(subm);
|
e_util_menu_item_theme_icon_set(mi, "folder-new");
|
||||||
e_menu_item_label_set(mi, _("Directory"));
|
e_menu_item_callback_set(mi, _e_fm2_new_directory, sd);
|
||||||
e_util_menu_item_theme_icon_set(mi, "folder-new");
|
|
||||||
e_menu_item_callback_set(mi, _e_fm2_new_directory, sd);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
static void
|
static void
|
||||||
_e_fm2_options_menu_pre(void *data, E_Menu *subm)
|
_e_fm2_options_menu_pre(void *data, E_Menu *subm)
|
||||||
|
|
|
@ -21,7 +21,7 @@ typedef enum _E_Fm2_Menu_Flags
|
||||||
E_FM2_MENU_NO_REFRESH = (1 << 0),
|
E_FM2_MENU_NO_REFRESH = (1 << 0),
|
||||||
E_FM2_MENU_NO_SHOW_HIDDEN = (1 << 1),
|
E_FM2_MENU_NO_SHOW_HIDDEN = (1 << 1),
|
||||||
E_FM2_MENU_NO_REMEMBER_ORDERING = (1 << 2),
|
E_FM2_MENU_NO_REMEMBER_ORDERING = (1 << 2),
|
||||||
E_FM2_MENU_NO_NEW_DIRECTORY = (1 << 3),
|
E_FM2_MENU_NO_NEW = (1 << 3),
|
||||||
E_FM2_MENU_NO_DELETE = (1 << 4),
|
E_FM2_MENU_NO_DELETE = (1 << 4),
|
||||||
E_FM2_MENU_NO_RENAME = (1 << 5),
|
E_FM2_MENU_NO_RENAME = (1 << 5),
|
||||||
E_FM2_MENU_NO_CUT = (1 << 6),
|
E_FM2_MENU_NO_CUT = (1 << 6),
|
||||||
|
|
|
@ -759,7 +759,7 @@ _e_fwin_page_favorites_add(E_Fwin_Page *page)
|
||||||
fmc.selection.windows_modifiers = 0;
|
fmc.selection.windows_modifiers = 0;
|
||||||
fmc.view.no_click_rename = 1;
|
fmc.view.no_click_rename = 1;
|
||||||
e_fm2_config_set(o, &fmc);
|
e_fm2_config_set(o, &fmc);
|
||||||
e_fm2_icon_menu_flags_set(o, E_FM2_MENU_NO_ACTIVATE_CHANGE);
|
e_fm2_icon_menu_flags_set(o, E_FM2_MENU_NO_NEW | E_FM2_MENU_NO_ACTIVATE_CHANGE);
|
||||||
//evas_object_smart_callback_add(o, "changed", _cb, fwin);
|
//evas_object_smart_callback_add(o, "changed", _cb, fwin);
|
||||||
evas_object_smart_callback_add(o, "selected", _e_fwin_favorite_selected, page);
|
evas_object_smart_callback_add(o, "selected", _e_fwin_favorite_selected, page);
|
||||||
e_fm2_path_set(o, "favorites", "/");
|
e_fm2_path_set(o, "favorites", "/");
|
||||||
|
|
Loading…
Reference in New Issue