add icon provision for gadcon classes and label provider functions. also add

all the data, update and add new icons etc. etc.


SVN revision: 22495

5 files changed, 43 insertions, 15 deletions

diff --git a/src/modules/clock/Makefile.am b/src/modules/clock/Makefile.am
index 20a027de45..7c61731c6c 100644
--- a/src/modules/clock/Makefile.am
+++ b/src/modules/clock/Makefile.am
@@ -4,6 +4,7 @@ MODULE = clock
 # 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 @@ EXTRA_DIST = $(files_DATA)
 # 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 \
diff --git a/src/modules/clock/e_mod_main.c b/src/modules/clock/e_mod_main.c
index b86b89b34a..ea16223a5a 100644
--- a/src/modules/clock/e_mod_main.c
+++ b/src/modules/clock/e_mod_main.c
@@ -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,
      "clock",
      {
-	_gc_init, _gc_shutdown, _gc_orient
+	_gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon
      }
 };
 /**/
@@ -34,6 +36,8 @@ struct _Instance
    Evas_Object     *o_clock;
 }; 
 
+static E_Module *clock_module = NULL;
+
 static E_Gadcon_Client *
 _gc_init(E_Gadcon *gc, char *name, char *id, char *style)
 {
@@ -78,6 +82,25 @@ _gc_orient(E_Gadcon_Client *gcc)
    e_gadcon_client_aspect_set(gcc, 16, 16);
    e_gadcon_client_min_size_set(gcc, 16, 16);
 }
+
+static char *
+_gc_label(void)
+{
+   return _("Clock");
+}
+
+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(clock_module));
+   edje_object_file_set(o, buf, "icon");
+   return o;
+}
 /**/
 /***************************************************************************/
 
@@ -97,37 +120,41 @@ EAPI E_Module_Api e_modapi =
 };
 
 EAPI void *
-e_modapi_init(E_Module *module)
+e_modapi_init(E_Module *m)
 {
+   clock_module = m;
+   
    e_gadcon_provider_register(&_gadcon_class);
    return 1;
 }
 
 EAPI int
-e_modapi_shutdown(E_Module *module)
+e_modapi_shutdown(E_Module *m)
 {
+   clock_module = NULL;
+   
    e_gadcon_provider_unregister(&_gadcon_class);
    return 1;
 }
 
 EAPI int
-e_modapi_save(E_Module *module)
+e_modapi_save(E_Module *m)
 {
    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 Clock Module"),
 			_("A simple module to give E17 a clock."));
diff --git a/src/modules/clock/e_mod_main.h b/src/modules/clock/e_mod_main.h
index 29677a219c..f00a37985b 100644
--- a/src/modules/clock/e_mod_main.h
+++ b/src/modules/clock/e_mod_main.h
@@ -6,11 +6,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
diff --git a/src/modules/clock/module.eap b/src/modules/clock/module.eap
new file mode 100644
index 0000000000..955f0bc040
--- /dev/null
+++ b/src/modules/clock/module.eap
diff --git a/src/modules/clock/module_icon.png b/src/modules/clock/module_icon.png
index 888c10b895..dde70fdbc4 100644
--- a/src/modules/clock/module_icon.png
+++ b/src/modules/clock/module_icon.png