Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/cpufreq
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/cpufreq/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- Makefile.am 18 Feb 2006 04:35:28 -0000 1.10
+++ Makefile.am 9 May 2006 13:02:47 -0000 1.11
@@ -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/cpufreq/e_mod_main.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- e_mod_main.c 5 May 2006 23:31:12 -0000 1.38
+++ e_mod_main.c 9 May 2006 13:02:47 -0000 1.39
@@ -15,13 +15,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,
"cpufreq",
{
- _gc_init, _gc_shutdown, _gc_orient
+ _gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon
}
};
/**/
@@ -119,6 +121,25 @@
e_gadcon_client_aspect_set(gcc, 16, 16);
e_gadcon_client_min_size_set(gcc, 16, 16);
}
+
+static char *
+_gc_label(void)
+{
+ return _("Cpufreq");
+}
+
+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(cpufreq_config->module));
+ edje_object_file_set(o, buf, "icon");
+ return o;
+}
/**/
/***************************************************************************/
@@ -815,7 +836,7 @@
};
EAPI void *
-e_modapi_init(E_Module *module)
+e_modapi_init(E_Module *m)
{
char buf[4096];
Evas_List *l;
@@ -840,7 +861,7 @@
E_CONFIG_LIMIT(cpufreq_config->poll_time, 0.5, 60.0);
snprintf(buf, sizeof(buf), "%s/%s/freqset",
- e_module_dir_get(module), MODULE_ARCH);
+ e_module_dir_get(m), MODULE_ARCH);
cpufreq_config->set_exe_path = strdup(buf);
cpufreq_config->frequency_check_timer =
ecore_timer_add(cpufreq_config->poll_time,
_cpufreq_cb_check, NULL);
@@ -859,13 +880,15 @@
}
}
}
+
+ cpufreq_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);
@@ -904,24 +927,24 @@
}
EAPI int
-e_modapi_save(E_Module *module)
+e_modapi_save(E_Module *m)
{
e_config_domain_save("module.cpufreq", conf_edd, cpufreq_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(_("CPU Frequency Controller Module"),
_("A simple module to control the frequency of the
system CPU.<br>"
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/cpufreq/e_mod_main.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_mod_main.h 20 Apr 2006 11:30:24 -0000 1.10
+++ e_mod_main.h 9 May 2006 13:02:47 -0000 1.11
@@ -21,6 +21,7 @@
int restore_governor;
char *governor;
/* just config state */
+ E_Module *module;
Evas_List *instances;
E_Menu *menu;
E_Menu *menu_poll;
@@ -33,11 +34,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 int e_modapi_config (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);
+EAPI int e_modapi_config (E_Module *m);
#endif
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/cpufreq/module_icon.png,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
Binary files /tmp/cvswrvnYR and /tmp/cvsb1J75H 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
