Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/pager
Modified Files:
Makefile.am e_mod_main.c e_mod_main.h module_icon.png
Added Files:
module.eap
Log Message:
add icon provision for gadcon classes and label provider functions. also add
all the data, update and add new icons etc. etc.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/pager/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- Makefile.am 20 Apr 2006 11:30:25 -0000 1.7
+++ Makefile.am 9 May 2006 13:02:48 -0000 1.8
@@ -4,6 +4,7 @@
# data files for the module
filesdir = $(libdir)/enlightenment/modules/$(MODULE)
files_DATA = \
+module.eap \
module_icon.png
EXTRA_DIST = $(files_DATA)
@@ -11,7 +12,7 @@
# the module .so file
INCLUDES = -I. \
-I$(top_srcdir) \
- -I$(top_srcdir)/$(MODULE) \
+ -I$(top_srcdir)/src/modules/$(MODULE) \
-I$(top_srcdir)/src/bin \
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/modules \
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/pager/e_mod_main.c,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -3 -r1.170 -r1.171
--- e_mod_main.c 5 May 2006 04:47:57 -0000 1.170
+++ e_mod_main.c 9 May 2006 13:02:48 -0000 1.171
@@ -10,13 +10,15 @@
static E_Gadcon_Client *_gc_init(E_Gadcon *gc, char *name, char *id, char
*style);
static void _gc_shutdown(E_Gadcon_Client *gcc);
static void _gc_orient(E_Gadcon_Client *gcc);
+static char *_gc_label(void);
+static Evas_Object *_gc_icon(Evas *evas);
/* and actually define the gadcon class that this module provides (just 1) */
static const E_Gadcon_Client_Class _gadcon_class =
{
GADCON_CLIENT_CLASS_VERSION,
"pager",
{
- _gc_init, _gc_shutdown, _gc_orient
+ _gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon
}
};
/**/
@@ -215,6 +217,25 @@
inst->pager->ynum * inst->pager->zone->h);
e_gadcon_client_min_size_set(gcc, 16, 16);
}
+
+static char *
+_gc_label(void)
+{
+ return _("Pager");
+}
+
+static Evas_Object *
+_gc_icon(Evas *evas)
+{
+ Evas_Object *o;
+ char buf[4096];
+
+ o = edje_object_add(evas);
+ snprintf(buf, sizeof(buf), "%s/module.eap",
+ e_module_dir_get(pager_config->module));
+ edje_object_file_set(o, buf, "icon");
+ return o;
+}
/**/
/***************************************************************************/
@@ -1684,7 +1705,7 @@
};
EAPI void *
-e_modapi_init(E_Module *module)
+e_modapi_init(E_Module *m)
{
conf_edd = E_CONFIG_DD_NEW("Pager_Config", Config);
#undef T
@@ -1760,12 +1781,14 @@
(pager_config->handlers, ecore_event_handler_add
(E_EVENT_CONTAINER_RESIZE, _pager_cb_event_container_resize, NULL));
+ pager_config->module = m;
+
e_gadcon_provider_register(&_gadcon_class);
return 1;
}
EAPI int
-e_modapi_shutdown(E_Module *module)
+e_modapi_shutdown(E_Module *m)
{
e_gadcon_provider_unregister(&_gadcon_class);
@@ -1790,24 +1813,24 @@
}
EAPI int
-e_modapi_save(E_Module *module)
+e_modapi_save(E_Module *m)
{
e_config_domain_save("module.pager", conf_edd, pager_config);
return 1;
}
EAPI int
-e_modapi_info(E_Module *module)
+e_modapi_info(E_Module *m)
{
char buf[4096];
- snprintf(buf, sizeof(buf), "%s/module_icon.png", e_module_dir_get(module));
- module->icon_file = strdup(buf);
+ snprintf(buf, sizeof(buf), "%s/module_icon.png", e_module_dir_get(m));
+ m->icon_file = strdup(buf);
return 1;
}
EAPI int
-e_modapi_about(E_Module *module)
+e_modapi_about(E_Module *m)
{
e_module_dialog_show(_("Enlightenment Pager Module"),
_("A pager module to navigate virtual desktops."));
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/pager/e_mod_main.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- e_mod_main.h 20 Apr 2006 11:30:25 -0000 1.44
+++ e_mod_main.h 9 May 2006 13:02:48 -0000 1.45
@@ -28,6 +28,7 @@
unsigned char resize;
Evas_List *items; /* FIXME: save/load this */
/* just config state */
+ E_Module *module;
E_Config_Dialog *config_dialog;
Evas_List *instances;
E_Menu *menu;
@@ -42,11 +43,11 @@
EAPI extern E_Module_Api e_modapi;
-EAPI void *e_modapi_init (E_Module *module);
-EAPI int e_modapi_shutdown (E_Module *module);
-EAPI int e_modapi_save (E_Module *module);
-EAPI int e_modapi_info (E_Module *module);
-EAPI int e_modapi_about (E_Module *module);
+EAPI void *e_modapi_init (E_Module *m);
+EAPI int e_modapi_shutdown (E_Module *m);
+EAPI int e_modapi_save (E_Module *m);
+EAPI int e_modapi_info (E_Module *m);
+EAPI int e_modapi_about (E_Module *m);
void _pager_cb_config_updated(void);
void _config_pager_module(Config_Item *ci);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/pager/module_icon.png,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
Binary files /tmp/cvsglLpaz and /tmp/cvsweoVFq differ
-------------------------------------------------------
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
