Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_actions.c e_config.c e_configure.c e_int_config_apps.c
e_int_config_keybindings.c e_int_config_mousebindings.c
e_int_menus.c e_int_menus.h
Log Message:
No reason why favorites shouldn't be enabled.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_actions.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -3 -r1.93 -r1.94
--- e_actions.c 24 Mar 2007 17:42:12 -0000 1.93
+++ e_actions.c 24 Mar 2007 18:18:41 -0000 1.94
@@ -1283,9 +1283,7 @@
_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();
@@ -2169,10 +2167,8 @@
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",
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -3 -r1.231 -r1.232
--- e_config.c 24 Mar 2007 08:28:41 -0000 1.231
+++ e_config.c 24 Mar 2007 18:18:42 -0000 1.232
@@ -795,9 +795,7 @@
E_BINDING_MODIFIER_ALT, 0, "window_menu", NULL);
CFG_MOUSEBIND(E_BINDING_CONTEXT_ZONE, 1, 0, 0, "menu_show", "main");
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;
@@ -906,22 +904,18 @@
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_configure.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -3 -r1.92 -r1.93
--- e_configure.c 20 Mar 2007 01:08:38 -0000 1.92
+++ e_configure.c 24 Mar 2007 18:18:42 -0000 1.93
@@ -426,11 +426,7 @@
_e_configure_item_add(cat, _("Window Manipulation"),
"enlightenment/window_manipulation", e_int_config_window_manipulation);
cat = _e_configure_category_add(eco, _("Menus"), "enlightenment/menus");
-#ifdef ENABLE_FAVORITES
_e_configure_item_add(cat, _("Application Menus"),
"enlightenment/applications", e_int_config_apps);
-#else
- _e_configure_item_add(cat, _("Applications Menu"),
"enlightenment/applications", e_int_config_apps);
-#endif
_e_configure_item_add(cat, _("Menu Settings"),
"enlightenment/menu_settings", e_int_config_menus);
_e_configure_item_add(cat, _("Client List Menu"), "enlightenment/windows",
e_int_config_clientlist);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_apps.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -3 -r1.61 -r1.62
--- e_int_config_apps.c 24 Mar 2007 18:02:29 -0000 1.61
+++ e_int_config_apps.c 24 Mar 2007 18:18:42 -0000 1.62
@@ -157,11 +157,7 @@
snprintf(cfdata->path_everything, sizeof(cfdata->path_everything),
"%s/.e/e/applications/all", cfdata->homedir);
snprintf(cfdata->path, sizeof(cfdata->path), "%s/.e/e/applications",
cfdata->homedir);
snprintf(cfdata->path_all, sizeof(cfdata->path_all),
"%s/.e/e/applications/menu/all", cfdata->homedir);
-#ifdef ENABLE_FAVORITES
snprintf(cfdata->path_menu, sizeof(cfdata->path_all),
"%s/.e/e/applications/menu", cfdata->homedir);
-#else
- snprintf(cfdata->path_menu, sizeof(cfdata->path_all),
"%s/.e/e/applications/menu/all", cfdata->homedir);
-#endif
return;
}
@@ -683,11 +679,7 @@
if ((once) && (once->title))
of = e_widget_framelist_add(evas, (char *)once->title, 0);
else
-#ifdef ENABLE_FAVORITES
of = e_widget_framelist_add(evas, _("Menus"), 0);
-#else
- of = e_widget_framelist_add(evas, _("Menu"), 0);
-#endif
mt = e_widget_button_add(evas, _("Go up a Directory"),
"widget/up_dir",
_cb_button_up, cfdata, NULL);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_keybindings.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- e_int_config_keybindings.c 15 Jan 2007 17:43:18 -0000 1.50
+++ e_int_config_keybindings.c 24 Mar 2007 18:18:42 -0000 1.51
@@ -555,22 +555,18 @@
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.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- e_int_config_mousebindings.c 15 Jan 2007 17:43:18 -0000 1.16
+++ e_int_config_mousebindings.c 24 Mar 2007 18:18:42 -0000 1.17
@@ -621,9 +621,7 @@
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.202
retrieving revision 1.203
diff -u -3 -r1.202 -r1.203
--- e_int_menus.c 24 Mar 2007 17:42:12 -0000 1.202
+++ e_int_menus.c 24 Mar 2007 18:18:42 -0000 1.203
@@ -8,9 +8,7 @@
struct _Main_Data
{
E_Menu *menu;
-#ifdef ENABLE_FAVORITES
E_Menu *apps;
-#endif
E_Menu *all_apps;
E_Menu *desktops;
E_Menu *clients;
@@ -95,7 +93,6 @@
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);
@@ -103,7 +100,6 @@
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;
@@ -257,7 +253,6 @@
return m;
}
-#ifdef ENABLE_FAVORITES
EAPI E_Menu *
e_int_menus_favorite_apps_new(void)
{
@@ -270,7 +265,6 @@
m = e_int_menus_apps_new(buf);
return m;
}
-#endif
EAPI E_Menu *
e_int_menus_all_apps_new(void)
@@ -386,9 +380,7 @@
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));
@@ -782,11 +774,7 @@
e_menu_item_callback_set(mi, _e_int_menus_shelf_item_cb, NULL);
mi = e_menu_item_new(m);
-#ifdef ENABLE_FAVORITES
e_menu_item_label_set(mi, _("Application Menus"));
-#else
- e_menu_item_label_set(mi, _("Applications Menu"));
-#endif
e_util_menu_item_edje_icon_set(mi, "enlightenment/applications");
e_menu_item_callback_set(mi, _e_int_menus_applications_item_cb, NULL);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_menus.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- e_int_menus.h 7 Nov 2006 22:45:49 -0000 1.19
+++ e_int_menus.h 24 Mar 2007 18:18:42 -0000 1.20
@@ -21,9 +21,7 @@
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);
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
