Enlightenment CVS committal
Author : onefang
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_actions.c e_config.c e_int_config_keybindings.c
e_int_config_mousebindings.c e_int_menus.c e_int_menus.h
Log Message:
Allow the favorite apps menu to be completely disabled. Also at rasters
request, allow the fm menu item to be disabled.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_actions.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -3 -r1.86 -r1.87
--- e_actions.c 2 Nov 2006 09:56:10 -0000 1.86
+++ e_actions.c 7 Nov 2006 22:45:49 -0000 1.87
@@ -1111,7 +1111,9 @@
_e_actions_menu_find(const char *name)
{
if (!strcmp(name, "main")) return e_int_menus_main_new();
+#ifdef ENABLE_FAVORITES
else if (!strcmp(name, "favorites")) return e_int_menus_favorite_apps_new();
+#endif
else if (!strcmp(name, "all")) return e_int_menus_all_apps_new();
else if (!strcmp(name, "clients")) return e_int_menus_clients_new();
else if (!strcmp(name, "lost_clients")) return
e_int_menus_lost_clients_new();
@@ -1960,7 +1962,9 @@
/* menu_show */
ACT_GO(menu_show);
e_action_predef_name_set(_("Menu"), _("Show Main Menu"), "menu_show",
"main", NULL, 0);
+#ifdef ENABLE_FAVORITES
e_action_predef_name_set(_("Menu"), _("Show Favorites Menu"), "menu_show",
"favorites", NULL, 0);
+#endif
e_action_predef_name_set(_("Menu"), _("Show All Applications Menu"),
"menu_show", "all", NULL, 0);
e_action_predef_name_set(_("Menu"), _("Show Clients Menu"), "menu_show",
"clients", NULL, 0);
e_action_predef_name_set(_("Menu"), _("Show Menu..."), "menu_show", NULL,
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -3 -r1.213 -r1.214
--- e_config.c 31 Oct 2006 14:37:31 -0000 1.213
+++ e_config.c 7 Nov 2006 22:45:49 -0000 1.214
@@ -766,9 +766,11 @@
CFG_MOUSEBIND(E_BINDING_CONTEXT_ZONE, 2,
0, 0,
"menu_show", "clients");
+#ifdef ENABLE_FAVORITES
CFG_MOUSEBIND(E_BINDING_CONTEXT_ZONE, 3,
0, 0,
"menu_show", "favorites");
+#endif
}
{
E_Config_Binding_Key *eb;
@@ -877,18 +879,22 @@
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "m",
E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
"menu_show", "main");
+#ifdef ENABLE_FAVORITES
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "a",
E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
"menu_show", "favorites");
+#endif
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "Menu",
0, 0,
"menu_show", "main");
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "Menu",
E_BINDING_MODIFIER_CTRL, 0,
"menu_show", "clients");
+#ifdef ENABLE_FAVORITES
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "Menu",
E_BINDING_MODIFIER_ALT, 0,
"menu_show", "favorites");
+#endif
CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "Insert",
E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
"exec", "Eterm");
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_keybindings.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- e_int_config_keybindings.c 23 Oct 2006 20:43:11 -0000 1.41
+++ e_int_config_keybindings.c 7 Nov 2006 22:45:49 -0000 1.42
@@ -563,18 +563,22 @@
CFG_KEYBIND_DFLT(E_BINDING_CONTEXT_ANY, "m",
E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
"menu_show", "main");
+#ifdef ENABLE_FAVORITES
CFG_KEYBIND_DFLT(E_BINDING_CONTEXT_ANY, "a",
E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
"menu_show", "favorites");
+#endif
CFG_KEYBIND_DFLT(E_BINDING_CONTEXT_ANY, "Menu",
0, 0,
"menu_show", "main");
CFG_KEYBIND_DFLT(E_BINDING_CONTEXT_ANY, "Menu",
E_BINDING_MODIFIER_CTRL, 0,
"menu_show", "clients");
+#ifdef ENABLE_FAVORITES
CFG_KEYBIND_DFLT(E_BINDING_CONTEXT_ANY, "Menu",
E_BINDING_MODIFIER_ALT, 0,
"menu_show", "favorites");
+#endif
CFG_KEYBIND_DFLT(E_BINDING_CONTEXT_ANY, "Insert",
E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0,
"exec", "Eterm");
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_mousebindings.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_int_config_mousebindings.c 31 Oct 2006 14:37:31 -0000 1.8
+++ e_int_config_mousebindings.c 7 Nov 2006 22:45:49 -0000 1.9
@@ -651,8 +651,9 @@
CFG_MOUSEBIND_DFLT(E_BINDING_CONTEXT_BORDER, 3, E_BINDING_MODIFIER_ALT, 0,
"window_menu", NULL);
CFG_MOUSEBIND_DFLT(E_BINDING_CONTEXT_ZONE, 1, 0, 0, "menu_show", "main");
CFG_MOUSEBIND_DFLT(E_BINDING_CONTEXT_ZONE, 2, 0, 0, "menu_show",
"clients");
+#ifdef ENABLE_FAVORITES
CFG_MOUSEBIND_DFLT(E_BINDING_CONTEXT_ZONE, 3, 0, 0, "menu_show",
"favorites");
-
+#endif
#define CFG_WHEELBIND_DFLT(_context, _direction, _z, _modifiers, _anymod,
_action, _params) \
bw = E_NEW(E_Config_Binding_Wheel, 1); \
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_menus.c,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -3 -r1.183 -r1.184
--- e_int_menus.c 19 Oct 2006 14:35:13 -0000 1.183
+++ e_int_menus.c 7 Nov 2006 22:45:49 -0000 1.184
@@ -8,7 +8,9 @@
struct _Main_Data
{
E_Menu *menu;
+#ifdef ENABLE_FAVORITES
E_Menu *apps;
+#endif
E_Menu *all_apps;
E_Menu *desktops;
E_Menu *clients;
@@ -84,12 +86,15 @@
e_object_del_attach_func_set(E_OBJECT(m), _e_int_menus_main_del_hook);
e_menu_category_set(m, "main");
+
+#ifdef ENABLE_FAVORITES
subm = e_int_menus_favorite_apps_new();
dat->apps = subm;
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Favorite Applications"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/favorites");
e_menu_item_submenu_set(mi, subm);
+#endif
subm = e_int_menus_all_apps_new();
dat->all_apps = subm;
@@ -98,10 +103,12 @@
e_util_menu_item_edje_icon_set(mi, "enlightenment/applications");
e_menu_item_submenu_set(mi, subm);
+#ifdef ENABLE_FILES
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Files"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/fileman");
e_menu_item_callback_set(mi, _e_int_menus_fwin_favorites_item_cb, NULL);
+#endif
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Run Command"));
@@ -241,6 +248,7 @@
return m;
}
+#ifdef ENABLE_FAVORITES
EAPI E_Menu *
e_int_menus_favorite_apps_new(void)
{
@@ -253,6 +261,7 @@
m = e_int_menus_apps_new(buf);
return m;
}
+#endif
EAPI E_Menu *
e_int_menus_all_apps_new(void)
@@ -367,7 +376,9 @@
dat = e_object_data_get(E_OBJECT(obj));
if (dat)
{
+#ifdef ENABLE_FAVORITES
e_object_del(E_OBJECT(dat->apps));
+#endif
e_object_del(E_OBJECT(dat->all_apps));
e_object_del(E_OBJECT(dat->desktops));
e_object_del(E_OBJECT(dat->clients));
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_menus.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- e_int_menus.h 16 Oct 2006 03:42:55 -0000 1.18
+++ e_int_menus.h 7 Nov 2006 22:45:49 -0000 1.19
@@ -21,7 +21,9 @@
EAPI E_Menu *e_int_menus_desktops_new(void);
EAPI E_Menu *e_int_menus_clients_new(void);
EAPI E_Menu *e_int_menus_apps_new(const char *dir);
+#ifdef ENABLE_FAVORITES
EAPI E_Menu *e_int_menus_favorite_apps_new(void);
+#endif
EAPI E_Menu *e_int_menus_all_apps_new(void);
EAPI E_Menu *e_int_menus_config_new(void);
EAPI E_Menu *e_int_menus_lost_clients_new(void);
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
