Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/start
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/start/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Makefile.am 18 Feb 2006 04:35:34 -0000 1.4
+++ Makefile.am 9 May 2006 13:02:48 -0000 1.5
@@ -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/start/e_mod_main.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- e_mod_main.c 23 Apr 2006 06:56:22 -0000 1.24
+++ e_mod_main.c 9 May 2006 13:02:48 -0000 1.25
@@ -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,
"start",
{
- _gc_init, _gc_shutdown, _gc_orient
+ _gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon
}
};
/**/
@@ -38,6 +40,8 @@
static void _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void
*event_info);
static void _menu_cb_post(void *data, E_Menu *m);
+static E_Module *start_module = NULL;
+
static E_Gadcon_Client *
_gc_init(E_Gadcon *gc, char *name, char *id, char *style)
{
@@ -90,6 +94,25 @@
e_gadcon_client_aspect_set(gcc, 16, 16);
e_gadcon_client_min_size_set(gcc, 16, 16);
}
+
+static char *
+_gc_label(void)
+{
+ return _("Start");
+}
+
+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(start_module));
+ edje_object_file_set(o, buf, "icon");
+ return o;
+}
/**/
/***************************************************************************/
@@ -205,6 +228,8 @@
EAPI void *
e_modapi_init(E_Module *m)
{
+ start_module = m;
+
e_gadcon_provider_register(&_gadcon_class);
return 1;
}
@@ -212,6 +237,8 @@
EAPI int
e_modapi_shutdown(E_Module *m)
{
+ start_module = NULL;
+
e_gadcon_provider_unregister(&_gadcon_class);
return 1;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/start/e_mod_main.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_mod_main.h 20 Apr 2006 11:30:25 -0000 1.8
+++ e_mod_main.h 9 May 2006 13:02:48 -0000 1.9
@@ -11,6 +11,5 @@
EAPI int e_modapi_save (E_Module *m);
EAPI int e_modapi_info (E_Module *m);
EAPI int e_modapi_about (E_Module *m);
-EAPI int e_modapi_config (E_Module *m);
#endif
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/start/module_icon.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
Binary files /tmp/cvsOwF2qI and /tmp/cvsYq3ebA 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
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs