Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
Makefile.am e_actions.c e_config.c e_includes.h e_int_menus.c
e_main.c
Removed Files:
e_exebuf.c e_exebuf.h
Log Message:
another example - exebuf goes to a module. it's even a godo demo of how a
moduel can extend the default action set (and remove its action) as well as
extend the default menus.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -3 -r1.197 -r1.198
--- Makefile.am 29 Jul 2007 06:58:23 -0000 1.197
+++ Makefile.am 1 Aug 2007 12:37:00 -0000 1.198
@@ -112,7 +112,6 @@
e_widget_config_list.h \
e_slider.h \
e_widget_slider.h \
-e_exebuf.h \
e_desklock.h \
e_screensaver.h \
e_dpms.h \
@@ -240,7 +239,6 @@
e_widget_config_list.c \
e_slider.c \
e_widget_slider.c \
-e_exebuf.c \
e_desklock.c \
e_screensaver.c \
e_dpms.c \
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_actions.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -3 -r1.103 -r1.104
--- e_actions.c 24 Jul 2007 17:51:45 -0000 1.103
+++ e_actions.c 1 Aug 2007 12:37:00 -0000 1.104
@@ -1964,16 +1964,6 @@
}
/***************************************************************************/
-ACT_FN_GO(exebuf)
-{
- E_Zone *zone;
-
- zone = _e_actions_zone_get(obj);
- if (zone)
- e_exebuf_show(zone);
-}
-
-/***************************************************************************/
ACT_FN_GO(desk_lock)
{
/* E_Zone *zone;
@@ -2303,11 +2293,6 @@
ACT_GO(pointer_resize_push);
ACT_GO(pointer_resize_pop);
- /* exebuf */
- ACT_GO(exebuf);
- e_action_predef_name_set(_("Launch"), _("Run Command Dialog"), "exebuf",
- NULL, NULL, 0);
-
/* desk_lock */
ACT_GO(desk_lock);
e_action_predef_name_set(_("Desktop"), _("Desktop Lock"), "desk_lock",
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -3 -r1.260 -r1.261
--- e_config.c 31 Jul 2007 15:08:40 -0000 1.260
+++ e_config.c 1 Aug 2007 12:37:00 -0000 1.261
@@ -758,6 +758,7 @@
CFG_MODULE("cpufreq", 1, 0);
CFG_MODULE("temperature", 1, 0);
CFG_MODULE("pager", 1, 0);
+ CFG_MODULE("exebuf", 1, 1);
CFG_MODULE("conf_applications", 1, 1);
CFG_MODULE("conf_borders", 1, 1);
CFG_MODULE("conf_clientlist", 1, 1);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_includes.h,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -3 -r1.167 -r1.168
--- e_includes.h 29 Jul 2007 06:58:23 -0000 1.167
+++ e_includes.h 1 Aug 2007 12:37:01 -0000 1.168
@@ -84,7 +84,6 @@
#include "e_widget_config_list.h"
#include "e_slider.h"
#include "e_widget_slider.h"
-#include "e_exebuf.h"
#include "e_desklock.h"
#include "e_screensaver.h"
#include "e_dpms.h"
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_menus.c,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -3 -r1.222 -r1.223
--- e_int_menus.c 28 Jul 2007 20:51:30 -0000 1.222
+++ e_int_menus.c 1 Aug 2007 12:37:01 -0000 1.223
@@ -20,9 +20,7 @@
/* local subsystem functions */
static void _e_int_menus_main_del_hook (void *obj);
static void _e_int_menus_main_about (void *data, E_Menu *m,
E_Menu_Item *mi);
-static int _e_int_menus_main_run_defer_cb (void *data);
static void _e_int_menus_fwin_favorites_item_cb(void *data, E_Menu *m,
E_Menu_Item *mi);
-static void _e_int_menus_main_run (void *data, E_Menu *m,
E_Menu_Item*mi);
static int _e_int_menus_main_lock_defer_cb (void *data);
static void _e_int_menus_main_lock (void *data, E_Menu *m,
E_Menu_Item*mi);
static void _e_int_menus_main_restart (void *data, E_Menu *m,
E_Menu_Item *mi);
@@ -85,6 +83,7 @@
E_Menu *m, *subm;
E_Menu_Item *mi;
Main_Data *dat;
+ Evas_List *l;
dat = calloc(1, sizeof(Main_Data));
m = e_menu_new();
@@ -95,6 +94,12 @@
e_menu_category_set(m, "main");
+ l = evas_hash_find(_e_int_menus_augmentation, "main/0");
+ if (l)
+ {
+ _e_int_menus_augmentation_add(m, l);
+ }
+
if (e_config->menu_favorites_show)
{
subm = e_int_menus_favorite_apps_new();
@@ -125,14 +130,21 @@
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"));
- e_util_menu_item_edje_icon_set(mi, "enlightenment/run");
- e_menu_item_callback_set(mi, _e_int_menus_main_run, NULL);
+ l = evas_hash_find(_e_int_menus_augmentation, "main/1");
+ if (l)
+ {
+ _e_int_menus_augmentation_add(m, l);
+ }
mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1);
+ l = evas_hash_find(_e_int_menus_augmentation, "main/2");
+ if (l)
+ {
+ _e_int_menus_augmentation_add(m, l);
+ }
+
subm = e_int_menus_desktops_new();
dat->desktops = subm;
mi = e_menu_item_new(m);
@@ -156,9 +168,22 @@
e_util_menu_item_edje_icon_set(mi, "enlightenment/lost_windows");
e_menu_item_submenu_set(mi, subm);
*/
+
+ l = evas_hash_find(_e_int_menus_augmentation, "main/3");
+ if (l)
+ {
+ _e_int_menus_augmentation_add(m, l);
+ }
+
mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1);
+ l = evas_hash_find(_e_int_menus_augmentation, "main/4");
+ if (l)
+ {
+ _e_int_menus_augmentation_add(m, l);
+ }
+
subm = e_menu_new();
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Enlightenment"));
@@ -176,9 +201,21 @@
e_util_menu_item_edje_icon_set(mi, "enlightenment/themes");
e_menu_item_callback_set(mi, _e_int_menus_themes_about, NULL);
+ l = evas_hash_find(_e_int_menus_augmentation, "main/5");
+ if (l)
+ {
+ _e_int_menus_augmentation_add(m, l);
+ }
+
mi = e_menu_item_new(subm);
e_menu_item_separator_set(mi, 1);
+ l = evas_hash_find(_e_int_menus_augmentation, "main/6");
+ if (l)
+ {
+ _e_int_menus_augmentation_add(m, l);
+ }
+
mi = e_menu_item_new(subm);
e_menu_item_label_set(mi, _("Restart"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/reset");
@@ -189,9 +226,21 @@
e_util_menu_item_edje_icon_set(mi, "enlightenment/exit");
e_menu_item_callback_set(mi, _e_int_menus_main_exit, NULL);
+ l = evas_hash_find(_e_int_menus_augmentation, "main/7");
+ if (l)
+ {
+ _e_int_menus_augmentation_add(m, l);
+ }
+
mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1);
+ l = evas_hash_find(_e_int_menus_augmentation, "main/8");
+ if (l)
+ {
+ _e_int_menus_augmentation_add(m, l);
+ }
+
subm = e_int_menus_config_new();
dat->config = subm;
mi = e_menu_item_new(m);
@@ -199,9 +248,21 @@
e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration");
e_menu_item_submenu_set(mi, subm);
+ l = evas_hash_find(_e_int_menus_augmentation, "main/9");
+ if (l)
+ {
+ _e_int_menus_augmentation_add(m, l);
+ }
+
mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1);
+ l = evas_hash_find(_e_int_menus_augmentation, "main/10");
+ if (l)
+ {
+ _e_int_menus_augmentation_add(m, l);
+ }
+
subm = e_int_menus_sys_new();
dat->sys = subm;
mi = e_menu_item_new(m);
@@ -209,6 +270,12 @@
e_util_menu_item_edje_icon_set(mi, "enlightenment/system");
e_menu_item_submenu_set(mi, subm);
+ l = evas_hash_find(_e_int_menus_augmentation, "main/11");
+ if (l)
+ {
+ _e_int_menus_augmentation_add(m, l);
+ }
+
return m;
}
@@ -394,6 +461,18 @@
e_object_del(E_OBJECT(dat->sys));
free(dat);
}
+ _e_int_menus_augmentation_del(m, evas_hash_find(_e_int_menus_augmentation,
"main/0"));
+ _e_int_menus_augmentation_del(m, evas_hash_find(_e_int_menus_augmentation,
"main/1"));
+ _e_int_menus_augmentation_del(m, evas_hash_find(_e_int_menus_augmentation,
"main/2"));
+ _e_int_menus_augmentation_del(m, evas_hash_find(_e_int_menus_augmentation,
"main/3"));
+ _e_int_menus_augmentation_del(m, evas_hash_find(_e_int_menus_augmentation,
"main/4"));
+ _e_int_menus_augmentation_del(m, evas_hash_find(_e_int_menus_augmentation,
"main/5"));
+ _e_int_menus_augmentation_del(m, evas_hash_find(_e_int_menus_augmentation,
"main/6"));
+ _e_int_menus_augmentation_del(m, evas_hash_find(_e_int_menus_augmentation,
"main/7"));
+ _e_int_menus_augmentation_del(m, evas_hash_find(_e_int_menus_augmentation,
"main/8"));
+ _e_int_menus_augmentation_del(m, evas_hash_find(_e_int_menus_augmentation,
"main/9"));
+ _e_int_menus_augmentation_del(m, evas_hash_find(_e_int_menus_augmentation,
"main/10"));
+ _e_int_menus_augmentation_del(m, evas_hash_find(_e_int_menus_augmentation,
"main/11"));
}
static void
@@ -414,31 +493,11 @@
if (about) e_theme_about_show(about);
}
-/* FIXME: this is a workaround for menus' haveing a key grab AND exebuf
- * wanting one too
- */
-static int
-_e_int_menus_main_run_defer_cb(void *data)
-{
- E_Zone *zone;
-
- zone = data;
- e_exebuf_show(zone);
- return 0;
-}
-
static void
_e_int_menus_fwin_favorites_item_cb(void *data, E_Menu *m, E_Menu_Item *mi)
{
e_fwin_new(m->zone->container, "favorites", "/");
}
-
-static void
-_e_int_menus_main_run(void *data, E_Menu *m, E_Menu_Item *mi)
-{
- ecore_idle_enterer_add(_e_int_menus_main_run_defer_cb, m->zone);
-}
-
/* FIXME: this is a workaround for menus' haveing a key grab AND exebuf
* wanting one too
*/
@@ -769,11 +828,26 @@
e_menu_pre_activate_callback_set(m, NULL, NULL);
+ l = evas_hash_find(_e_int_menus_augmentation, "config/0");
+ if (l)
+ {
+ _e_int_menus_augmentation_add(m, l);
+ }
+
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Configuration Panel"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration");
e_menu_item_callback_set(mi, _e_int_menus_config_item_cb, NULL);
+ l = evas_hash_find(_e_int_menus_augmentation, "config/1");
+ if (l)
+ {
+ mi = e_menu_item_new(m);
+ e_menu_item_separator_set(mi, 1);
+
+ _e_int_menus_augmentation_add(m, l);
+ }
+
mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1);
@@ -809,7 +883,7 @@
e_menu_item_callback_set(mi, _e_int_menus_shelf_item_cb, NULL);
}
- l = evas_hash_find(_e_int_menus_augmentation, "config");
+ l = evas_hash_find(_e_int_menus_augmentation, "config/2");
if (l)
{
mi = e_menu_item_new(m);
@@ -827,7 +901,9 @@
E_Menu *m;
m = obj;
- _e_int_menus_augmentation_del(m, evas_hash_find(_e_int_menus_augmentation,
"config"));
+ _e_int_menus_augmentation_del(m, evas_hash_find(_e_int_menus_augmentation,
"config/0"));
+ _e_int_menus_augmentation_del(m, evas_hash_find(_e_int_menus_augmentation,
"config/1"));
+ _e_int_menus_augmentation_del(m, evas_hash_find(_e_int_menus_augmentation,
"config/2"));
}
static void
@@ -844,7 +920,7 @@
e_menu_pre_activate_callback_set(m, NULL, NULL);
- l = evas_hash_find(_e_int_menus_augmentation, "sys");
+ l = evas_hash_find(_e_int_menus_augmentation, "sys/0");
if (l)
{
_e_int_menus_augmentation_add(m, l);
@@ -903,6 +979,15 @@
e_util_menu_item_edje_icon_set(mi, "enlightenment/logout");
e_menu_item_callback_set(mi, _e_int_menus_main_logout, NULL);
+ l = evas_hash_find(_e_int_menus_augmentation, "sys/1");
+ if (l)
+ {
+ _e_int_menus_augmentation_add(m, l);
+
+ mi = e_menu_item_new(m);
+ e_menu_item_separator_set(mi, 1);
+ }
+
e_object_free_attach_func_set(E_OBJECT(m), _e_int_menus_sys_free_hook);
}
@@ -912,7 +997,8 @@
E_Menu *m;
m = obj;
- _e_int_menus_augmentation_del(m, evas_hash_find(_e_int_menus_augmentation,
"sys"));
+ _e_int_menus_augmentation_del(m, evas_hash_find(_e_int_menus_augmentation,
"sys/0"));
+ _e_int_menus_augmentation_del(m, evas_hash_find(_e_int_menus_augmentation,
"sys/1"));
}
static int
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -3 -r1.226 -r1.227
--- e_main.c 26 Jul 2007 12:29:52 -0000 1.226
+++ e_main.c 1 Aug 2007 12:37:01 -0000 1.227
@@ -772,14 +772,6 @@
_e_main_shutdown(-1);
}
_e_main_shutdown_push(e_shelf_shutdown);
- TS("exebuf");
- /* setup exebuf */
- if (!e_exebuf_init())
- {
- e_error_message_show(_("Enlightenment cannot set up its exebuf
system."));
- _e_main_shutdown(-1);
- }
- _e_main_shutdown_push(e_exebuf_shutdown);
TS("dpms");
/* setup dpms */
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
