enlightenment
/
enlightenment-module-tclock
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix nasty formatting. Remove event_feed when showing menu as it's not 

needed.



SVN revision: 39822
This commit is contained in:
Christopher Michael 2009-03-31 17:29:12 +00:00
parent 8c3bd8614d
commit 1aff532015
2 changed files with 257 additions and 265 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

490
e_mod_main.c
View File

@ -15,21 +15,21 @@
#endif #endif
/* Func Proto Requirements for Gadcon */ /* Func Proto Requirements for Gadcon */
static E_Gadcon_Client *_gc_init (E_Gadcon *gc, const char *name, const char *id, const char *style); static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
static void _gc_shutdown (E_Gadcon_Client *gcc); static void _gc_shutdown(E_Gadcon_Client *gcc);
static void _gc_orient (E_Gadcon_Client *gcc, E_Gadcon_Orient orient); static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
static char *_gc_label (E_Gadcon_Client_Class *client_class); static char *_gc_label(E_Gadcon_Client_Class *client_class);
static Evas_Object *_gc_icon (E_Gadcon_Client_Class *client_class, Evas *evas); static Evas_Object *_gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas);
static const char *_gc_id_new (E_Gadcon_Client_Class *client_class); static const char *_gc_id_new(E_Gadcon_Client_Class *client_class);
/* Module Protos */ /* Module Protos */
static void _tclock_cb_mouse_down (void *data, Evas *e, Evas_Object *obj, void *event_info); static void _tclock_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _tclock_cb_mouse_in (void *data, Evas *e, Evas_Object *obj, void *event_info); static void _tclock_cb_mouse_in(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _tclock_cb_mouse_out (void *data, Evas *e, Evas_Object *obj, void *event_info); static void _tclock_cb_mouse_out(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _tclock_menu_cb_configure (void *data, E_Menu *m, E_Menu_Item *mi); static void _tclock_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi);
static void _tclock_menu_cb_post (void *data, E_Menu *m); static void _tclock_menu_cb_post(void *data, E_Menu *m);
static int _tclock_cb_check (void *data); static int _tclock_cb_check(void *data);
static Config_Item *_tclock_config_item_get (const char *id); static Config_Item *_tclock_config_item_get(const char *id);
static E_Config_DD *conf_edd = NULL; static E_Config_DD *conf_edd = NULL;
static E_Config_DD *conf_item_edd = NULL; static E_Config_DD *conf_item_edd = NULL;
@ -39,167 +39,163 @@ Config *tclock_config = NULL;
/* Define the class and gadcon functions this module provides */ /* Define the class and gadcon functions this module provides */
static const E_Gadcon_Client_Class _gc_class = { static const E_Gadcon_Client_Class _gc_class = {
GADCON_CLIENT_CLASS_VERSION, GADCON_CLIENT_CLASS_VERSION,
"tclock", {_gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon, _gc_id_new, NULL}, "tclock", {_gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon, _gc_id_new, NULL},
E_GADCON_CLIENT_STYLE_PLAIN E_GADCON_CLIENT_STYLE_PLAIN
}; };
typedef struct _Instance Instance; typedef struct _Instance Instance;
struct _Instance struct _Instance
{ {
E_Gadcon_Client *gcc; E_Gadcon_Client *gcc;
Evas_Object *tclock, *o_tip; Evas_Object *tclock, *o_tip;
Config_Item *ci; Config_Item *ci;
E_Popup *tip; E_Popup *tip;
}; };
static E_Gadcon_Client * static E_Gadcon_Client *
_gc_init (E_Gadcon * gc, const char *name, const char *id, const char *style) _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
{ {
Evas_Object *o; Evas_Object *o;
E_Gadcon_Client *gcc; E_Gadcon_Client *gcc;
Instance *inst; Instance *inst;
char buf[4096]; char buf[4096];
inst = E_NEW (Instance, 1); inst = E_NEW(Instance, 1);
inst->ci = _tclock_config_item_get (id); inst->ci = _tclock_config_item_get(id);
if (!inst->ci->id) if (!inst->ci->id) inst->ci->id = eina_stringshare_add(id);
inst->ci->id = eina_stringshare_add (id);
o = edje_object_add (gc->evas); o = edje_object_add(gc->evas);
snprintf (buf, sizeof (buf), "%s/tclock.edj", snprintf(buf, sizeof (buf), "%s/tclock.edj",
e_module_dir_get (tclock_config->module)); e_module_dir_get(tclock_config->module));
if (!e_theme_edje_object_set if (!e_theme_edje_object_set
(o, "base/theme/modules/tclock", "modules/tclock/main")) (o, "base/theme/modules/tclock", "modules/tclock/main"))
edje_object_file_set (o, buf, "modules/tclock/main"); edje_object_file_set(o, buf, "modules/tclock/main");
evas_object_show (o); evas_object_show(o);
gcc = e_gadcon_client_new (gc, name, id, style, o); gcc = e_gadcon_client_new(gc, name, id, style, o);
gcc->data = inst; gcc->data = inst;
inst->gcc = gcc; inst->gcc = gcc;
inst->tclock = o; inst->tclock = o;
evas_object_event_callback_add (o, EVAS_CALLBACK_MOUSE_DOWN, evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
_tclock_cb_mouse_down, inst); _tclock_cb_mouse_down, inst);
evas_object_event_callback_add (o, EVAS_CALLBACK_MOUSE_IN, evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_IN,
_tclock_cb_mouse_in, inst); _tclock_cb_mouse_in, inst);
evas_object_event_callback_add (o, EVAS_CALLBACK_MOUSE_OUT, evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_OUT,
_tclock_cb_mouse_out, inst); _tclock_cb_mouse_out, inst);
tclock_config->instances = tclock_config->instances =
eina_list_append (tclock_config->instances, inst); eina_list_append(tclock_config->instances, inst);
_tclock_cb_check (inst); _tclock_cb_check(inst);
if (!check_timer) if (!check_timer)
check_timer = ecore_timer_add (1.0, _tclock_cb_check, NULL); check_timer = ecore_timer_add(1.0, _tclock_cb_check, NULL);
return gcc; return gcc;
} }
static void static void
_gc_shutdown (E_Gadcon_Client * gcc) _gc_shutdown(E_Gadcon_Client *gcc)
{ {
Instance *inst; Instance *inst;
inst = gcc->data; inst = gcc->data;
evas_object_event_callback_del (inst->tclock, EVAS_CALLBACK_MOUSE_DOWN, evas_object_event_callback_del(inst->tclock, EVAS_CALLBACK_MOUSE_DOWN,
_tclock_cb_mouse_down); _tclock_cb_mouse_down);
evas_object_event_callback_del (inst->tclock, EVAS_CALLBACK_MOUSE_IN, evas_object_event_callback_del(inst->tclock, EVAS_CALLBACK_MOUSE_IN,
_tclock_cb_mouse_in); _tclock_cb_mouse_in);
evas_object_event_callback_del (inst->tclock, EVAS_CALLBACK_MOUSE_OUT, evas_object_event_callback_del(inst->tclock, EVAS_CALLBACK_MOUSE_OUT,
_tclock_cb_mouse_out); _tclock_cb_mouse_out);
evas_object_del (inst->tclock); evas_object_del(inst->tclock);
tclock_config->instances = tclock_config->instances =
eina_list_remove (tclock_config->instances, inst); eina_list_remove(tclock_config->instances, inst);
if (eina_list_count (tclock_config->instances) <= 0) if (eina_list_count(tclock_config->instances) <= 0)
{ {
ecore_timer_del (check_timer); ecore_timer_del(check_timer);
check_timer = NULL; check_timer = NULL;
} }
E_FREE (inst); E_FREE(inst);
} }
static void static void
_gc_orient (E_Gadcon_Client * gcc, E_Gadcon_Orient orient) _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
{ {
Instance *inst; Instance *inst;
Evas_Coord mw, mh; Evas_Coord mw, mh;
inst = gcc->data; inst = gcc->data;
edje_object_size_min_calc (inst->tclock, &mw, &mh); edje_object_size_min_calc(inst->tclock, &mw, &mh);
e_gadcon_client_min_size_set (gcc, mw, mh); e_gadcon_client_min_size_set(gcc, mw, mh);
} }
static char * static char *
_gc_label (E_Gadcon_Client_Class *client_class) _gc_label(E_Gadcon_Client_Class *client_class)
{ {
return D_ ("TClock"); return D_("TClock");
} }
static Evas_Object * static Evas_Object *
_gc_icon (E_Gadcon_Client_Class *client_class, Evas * evas) _gc_icon(E_Gadcon_Client_Class *client_class, Evas *evas)
{ {
Evas_Object *o; Evas_Object *o;
char buf[4096]; char buf[4096];
o = edje_object_add (evas); o = edje_object_add (evas);
snprintf (buf, sizeof (buf), "%s/e-module-tclock.edj", snprintf(buf, sizeof (buf), "%s/e-module-tclock.edj",
e_module_dir_get (tclock_config->module)); e_module_dir_get(tclock_config->module));
edje_object_file_set (o, buf, "icon"); edje_object_file_set(o, buf, "icon");
return o; return o;
} }
static const char * static const char *
_gc_id_new (E_Gadcon_Client_Class *client_class) _gc_id_new(E_Gadcon_Client_Class *client_class)
{ {
Config_Item *ci; Config_Item *ci;
ci = _tclock_config_item_get (NULL); ci = _tclock_config_item_get(NULL);
return ci->id; return ci->id;
} }
static void static void
_tclock_cb_mouse_down (void *data, Evas * e, Evas_Object * obj, _tclock_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
void *event_info)
{ {
Instance *inst; Instance *inst;
Evas_Event_Mouse_Down *ev; Evas_Event_Mouse_Down *ev;
inst = data; inst = data;
ev = event_info; ev = event_info;
if ((ev->button == 3) && (!tclock_config->menu)) if ((ev->button == 3) && (!tclock_config->menu))
{ {
E_Menu *mn; E_Menu *mn;
E_Menu_Item *mi; E_Menu_Item *mi;
int x, y; int x, y;
mn = e_menu_new (); mn = e_menu_new();
e_menu_post_deactivate_callback_set (mn, _tclock_menu_cb_post, inst); e_menu_post_deactivate_callback_set(mn, _tclock_menu_cb_post, inst);
tclock_config->menu = mn; tclock_config->menu = mn;
mi = e_menu_item_new (mn); mi = e_menu_item_new(mn);
e_menu_item_label_set (mi, D_ ("Configuration")); e_menu_item_label_set(mi, D_("Configuration"));
e_util_menu_item_theme_icon_set(mi, "preferences-system"); e_util_menu_item_theme_icon_set(mi, "preferences-system");
e_menu_item_callback_set (mi, _tclock_menu_cb_configure, inst); e_menu_item_callback_set(mi, _tclock_menu_cb_configure, inst);
mi = e_menu_item_new (mn); mi = e_menu_item_new(mn);
e_menu_item_separator_set (mi, 1); e_menu_item_separator_set(mi, 1);
e_gadcon_client_util_menu_items_append (inst->gcc, mn, 0); e_gadcon_client_util_menu_items_append(inst->gcc, mn, 0);
e_gadcon_canvas_zone_geometry_get (inst->gcc->gadcon, &x, &y, NULL, NULL); e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &x, &y, NULL, NULL);
e_menu_activate_mouse (mn, e_menu_activate_mouse (mn,
e_util_zone_current_get (e_manager_current_get e_util_zone_current_get(e_manager_current_get
()), x + ev->output.x, ()), x + ev->output.x,
y + ev->output.y, 1, 1, y + ev->output.y, 1, 1,
E_MENU_POP_DIRECTION_AUTO, ev->timestamp); E_MENU_POP_DIRECTION_AUTO, ev->timestamp);
evas_event_feed_mouse_up (inst->gcc->gadcon->evas, ev->button, }
EVAS_BUTTON_NONE, ev->timestamp, NULL);
}
} }
static void static void
@ -229,11 +225,11 @@ _tclock_cb_mouse_in(void *data, Evas *e, Evas_Object *obj, void *event_info)
edje_object_file_set(inst->o_tip, buf, "modules/tclock/tip"); edje_object_file_set(inst->o_tip, buf, "modules/tclock/tip");
evas_object_show(inst->o_tip); evas_object_show(inst->o_tip);
current_time = time (NULL); current_time = time(NULL);
local_time = localtime (&current_time); local_time = localtime(&current_time);
memset (buf, 0, sizeof (buf)); memset(buf, 0, sizeof(buf));
strftime (buf, 1024, inst->ci->tip_format, local_time); strftime(buf, 1024, inst->ci->tip_format, local_time);
edje_object_part_text_set (inst->o_tip, "e.text.tip", buf); edje_object_part_text_set(inst->o_tip, "e.text.tip", buf);
evas_object_move(inst->o_tip, 0, 0); evas_object_move(inst->o_tip, 0, 0);
edje_object_size_min_calc(inst->o_tip, &w, &h); edje_object_size_min_calc(inst->o_tip, &w, &h);
@ -298,54 +294,52 @@ _tclock_cb_mouse_out(void *data, Evas *e, Evas_Object *obj, void *event_info)
} }
static void static void
_tclock_menu_cb_post (void *data, E_Menu * m) _tclock_menu_cb_post(void *data, E_Menu *m)
{ {
if (!tclock_config->menu) if (!tclock_config->menu) return;
return; e_object_del(E_OBJECT(tclock_config->menu));
e_object_del (E_OBJECT (tclock_config->menu)); tclock_config->menu = NULL;
tclock_config->menu = NULL;
} }
static void static void
_tclock_menu_cb_configure (void *data, E_Menu * m, E_Menu_Item * mi) _tclock_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi)
{ {
Instance *inst; Instance *inst;
inst = data; inst = data;
_config_tclock_module (inst->ci); _config_tclock_module(inst->ci);
} }
void void
_tclock_config_updated (Config_Item *ci) _tclock_config_updated(Config_Item *ci)
{ {
Eina_List *l; Eina_List *l;
if (!tclock_config) if (!tclock_config) return;
return; for (l = tclock_config->instances; l; l = l->next)
for (l = tclock_config->instances; l; l = l->next) {
{ Instance *inst;
Instance *inst;
inst = l->data; inst = l->data;
if (inst->ci != ci) continue; if (inst->ci != ci) continue;
if (!inst->ci->show_time) if (!inst->ci->show_time)
edje_object_signal_emit (inst->tclock, "time_hidden", ""); edje_object_signal_emit(inst->tclock, "time_hidden", "");
else else
edje_object_signal_emit (inst->tclock, "time_visible", ""); edje_object_signal_emit(inst->tclock, "time_visible", "");
edje_object_message_signal_process (inst->tclock); edje_object_message_signal_process(inst->tclock);
if (!inst->ci->show_date) if (!inst->ci->show_date)
edje_object_signal_emit (inst->tclock, "date_hidden", ""); edje_object_signal_emit(inst->tclock, "date_hidden", "");
else else
edje_object_signal_emit (inst->tclock, "date_visible", ""); edje_object_signal_emit(inst->tclock, "date_visible", "");
edje_object_message_signal_process (inst->tclock); edje_object_message_signal_process(inst->tclock);
_tclock_cb_check (inst); _tclock_cb_check(inst);
} }
} }
static int static int
_tclock_cb_check (void *data) _tclock_cb_check(void *data)
{ {
Instance *inst; Instance *inst;
Eina_List *l; Eina_List *l;
@ -353,50 +347,50 @@ _tclock_cb_check (void *data)
struct tm *local_time; struct tm *local_time;
char buf[1024]; char buf[1024];
current_time = time (NULL); current_time = time(NULL);
local_time = localtime (&current_time); local_time = localtime(&current_time);
for (l = tclock_config->instances; l; l = l->next) for (l = tclock_config->instances; l; l = l->next)
{ {
inst = l->data; inst = l->data;
if (!inst->ci->show_time) if (!inst->ci->show_time)
edje_object_signal_emit (inst->tclock, "time_hidden", ""); edje_object_signal_emit(inst->tclock, "time_hidden", "");
else else
edje_object_signal_emit (inst->tclock, "time_visible", ""); edje_object_signal_emit(inst->tclock, "time_visible", "");
edje_object_message_signal_process (inst->tclock); edje_object_message_signal_process(inst->tclock);
if (!inst->ci->show_date) if (!inst->ci->show_date)
edje_object_signal_emit (inst->tclock, "date_hidden", ""); edje_object_signal_emit(inst->tclock, "date_hidden", "");
else else
edje_object_signal_emit (inst->tclock, "date_visible", ""); edje_object_signal_emit(inst->tclock, "date_visible", "");
edje_object_message_signal_process (inst->tclock); edje_object_message_signal_process(inst->tclock);
memset (buf, 0, sizeof (buf)); memset (buf, 0, sizeof(buf));
if (inst->ci->time_format) if (inst->ci->time_format)
{ {
strftime (buf, 1024, inst->ci->time_format, local_time); strftime(buf, 1024, inst->ci->time_format, local_time);
edje_object_part_text_set (inst->tclock, "tclock_time", buf); edje_object_part_text_set(inst->tclock, "tclock_time", buf);
if (inst->tip) if (inst->tip)
edje_object_part_text_set(inst->o_tip, "e.text.tip", buf); edje_object_part_text_set(inst->o_tip, "e.text.tip", buf);
} }
if (inst->ci->date_format) if (inst->ci->date_format)
{ {
strftime (buf, 1024, inst->ci->date_format, local_time); strftime(buf, 1024, inst->ci->date_format, local_time);
edje_object_part_text_set (inst->tclock, "tclock_date", buf); edje_object_part_text_set(inst->tclock, "tclock_date", buf);
} }
if ((inst->ci->tip_format) && (inst->o_tip)) if ((inst->ci->tip_format) && (inst->o_tip))
{ {
strftime (buf, 1024, inst->ci->tip_format, local_time); strftime(buf, 1024, inst->ci->tip_format, local_time);
edje_object_part_text_set (inst->o_tip, "e.text.tip", buf); edje_object_part_text_set(inst->o_tip, "e.text.tip", buf);
} }
} }
return 1; return 1;
} }
static Config_Item * static Config_Item *
_tclock_config_item_get (const char *id) _tclock_config_item_get(const char *id)
{ {
Eina_List *l; Eina_List *l;
Config_Item *ci; Config_Item *ci;
@ -410,11 +404,12 @@ _tclock_config_item_get (const char *id)
if (tclock_config->items) if (tclock_config->items)
{ {
const char *p; const char *p;
ci = eina_list_last (tclock_config->items)->data;
p = strrchr (ci->id, '.'); ci = eina_list_last(tclock_config->items)->data;
if (p) num = atoi (p + 1) + 1; p = strrchr(ci->id, '.');
if (p) num = atoi(p + 1) + 1;
} }
snprintf (buf, sizeof (buf), "%s.%d", _gc_class.name, num); snprintf(buf, sizeof(buf), "%s.%d", _gc_class.name, num);
id = buf; id = buf;
} }
else else
@ -422,129 +417,126 @@ _tclock_config_item_get (const char *id)
for (l = tclock_config->items; l; l = l->next) for (l = tclock_config->items; l; l = l->next)
{ {
ci = l->data; ci = l->data;
if (!ci->id) if (!ci->id) continue;
continue; if (!strcmp(ci->id, id)) return ci;
if (!strcmp (ci->id, id))
return ci;
} }
} }
ci = E_NEW (Config_Item, 1); ci = E_NEW(Config_Item, 1);
ci->id = eina_stringshare_add (id); ci->id = eina_stringshare_add(id);
ci->show_date = 1; ci->show_date = 1;
ci->show_time = 1; ci->show_time = 1;
ci->show_tip = 1; ci->show_tip = 1;
ci->time_format = eina_stringshare_add ("%T"); ci->time_format = eina_stringshare_add("%T");
ci->date_format = eina_stringshare_add ("%d/%m/%y"); ci->date_format = eina_stringshare_add("%d/%m/%y");
ci->tip_format = eina_stringshare_add("%A, %B %d, %Y"); ci->tip_format = eina_stringshare_add("%A, %B %d, %Y");
tclock_config->items = eina_list_append (tclock_config->items, ci); tclock_config->items = eina_list_append(tclock_config->items, ci);
return ci; return ci;
} }
EAPI E_Module_Api e_modapi = { EAPI E_Module_Api e_modapi = {
E_MODULE_API_VERSION, E_MODULE_API_VERSION, "TClock"
"TClock"
}; };
EAPI void * EAPI void *
e_modapi_init (E_Module * m) e_modapi_init(E_Module *m)
{ {
char buf[4096]; char buf[4096];
#if HAVE_LOCALE_H #if HAVE_LOCALE_H
setlocale(LC_ALL, ""); setlocale(LC_ALL, "");
#endif #endif
snprintf (buf, sizeof (buf), "%s/locale", e_module_dir_get (m)); snprintf(buf, sizeof(buf), "%s/locale", e_module_dir_get(m));
bindtextdomain (PACKAGE, buf); bindtextdomain(PACKAGE, buf);
bind_textdomain_codeset (PACKAGE, "UTF-8"); bind_textdomain_codeset(PACKAGE, "UTF-8");
conf_item_edd = E_CONFIG_DD_NEW ("TClock_Config_Item", Config_Item); conf_item_edd = E_CONFIG_DD_NEW("TClock_Config_Item", Config_Item);
#undef T #undef T
#undef D #undef D
#define T Config_Item #define T Config_Item
#define D conf_item_edd #define D conf_item_edd
E_CONFIG_VAL (D, T, id, STR); E_CONFIG_VAL(D, T, id, STR);
E_CONFIG_VAL (D, T, show_date, INT); E_CONFIG_VAL(D, T, show_date, INT);
E_CONFIG_VAL (D, T, show_time, INT); E_CONFIG_VAL(D, T, show_time, INT);
E_CONFIG_VAL (D, T, show_tip, INT); E_CONFIG_VAL(D, T, show_tip, INT);
E_CONFIG_VAL (D, T, date_format, STR); E_CONFIG_VAL(D, T, date_format, STR);
E_CONFIG_VAL (D, T, time_format, STR); E_CONFIG_VAL(D, T, time_format, STR);
E_CONFIG_VAL (D, T, tip_format, STR); E_CONFIG_VAL(D, T, tip_format, STR);
conf_edd = E_CONFIG_DD_NEW ("TClock_Config", Config); conf_edd = E_CONFIG_DD_NEW("TClock_Config", Config);
#undef T #undef T
#undef D #undef D
#define T Config #define T Config
#define D conf_edd #define D conf_edd
E_CONFIG_LIST (D, T, items, conf_item_edd); E_CONFIG_LIST(D, T, items, conf_item_edd);
tclock_config = e_config_domain_load ("module.tclock", conf_edd); tclock_config = e_config_domain_load("module.tclock", conf_edd);
if (!tclock_config) if (!tclock_config)
{ {
Config_Item *ci; Config_Item *ci;
tclock_config = E_NEW (Config, 1); tclock_config = E_NEW(Config, 1);
ci = E_NEW (Config_Item, 1); ci = E_NEW(Config_Item, 1);
ci->id = eina_stringshare_add ("0"); ci->id = eina_stringshare_add("0");
ci->show_date = 1; ci->show_date = 1;
ci->show_time = 1; ci->show_time = 1;
ci->show_tip = 1; ci->show_tip = 1;
ci->time_format = eina_stringshare_add ("%T"); ci->time_format = eina_stringshare_add("%T");
ci->date_format = eina_stringshare_add ("%d/%m/%y"); ci->date_format = eina_stringshare_add("%d/%m/%y");
ci->tip_format = eina_stringshare_add("%d"); ci->tip_format = eina_stringshare_add("%d");
tclock_config->items = eina_list_append (tclock_config->items, ci); tclock_config->items = eina_list_append(tclock_config->items, ci);
} }
tclock_config->module = m; tclock_config->module = m;
e_gadcon_provider_register (&_gc_class); e_gadcon_provider_register(&_gc_class);
return m; return m;
} }
EAPI int EAPI int
e_modapi_shutdown (E_Module * m) e_modapi_shutdown(E_Module *m)
{ {
tclock_config->module = NULL; tclock_config->module = NULL;
e_gadcon_provider_unregister (&_gc_class); e_gadcon_provider_unregister(&_gc_class);
if (tclock_config->config_dialog) if (tclock_config->config_dialog)
e_object_del (E_OBJECT (tclock_config->config_dialog)); e_object_del(E_OBJECT(tclock_config->config_dialog));
if (tclock_config->menu) if (tclock_config->menu)
{ {
e_menu_post_deactivate_callback_set (tclock_config->menu, NULL, NULL); e_menu_post_deactivate_callback_set(tclock_config->menu, NULL, NULL);
e_object_del (E_OBJECT (tclock_config->menu)); e_object_del(E_OBJECT(tclock_config->menu));
tclock_config->menu = NULL; tclock_config->menu = NULL;
} }
while (tclock_config->items) while (tclock_config->items)
{ {
Config_Item *ci; Config_Item *ci;
ci = tclock_config->items->data; ci = tclock_config->items->data;
tclock_config->items = tclock_config->items =
eina_list_remove_list (tclock_config->items, tclock_config->items); eina_list_remove_list(tclock_config->items, tclock_config->items);
if (ci->id) if (ci->id)
eina_stringshare_del (ci->id); eina_stringshare_del(ci->id);
if (ci->time_format) if (ci->time_format)
eina_stringshare_del (ci->time_format); eina_stringshare_del(ci->time_format);
if (ci->date_format) if (ci->date_format)
eina_stringshare_del (ci->date_format); eina_stringshare_del(ci->date_format);
if (ci->tip_format) if (ci->tip_format)
eina_stringshare_del(ci->tip_format); eina_stringshare_del(ci->tip_format);
E_FREE (ci); E_FREE (ci);
} }
E_FREE (tclock_config); E_FREE(tclock_config);
E_CONFIG_DD_FREE (conf_item_edd); E_CONFIG_DD_FREE(conf_item_edd);
E_CONFIG_DD_FREE (conf_edd); E_CONFIG_DD_FREE(conf_edd);
return 1; return 1;
} }
EAPI int EAPI int
e_modapi_save (E_Module * m) e_modapi_save(E_Module *m)
{ {
e_config_domain_save ("module.tclock", conf_edd, tclock_config); e_config_domain_save("module.tclock", conf_edd, tclock_config);
return 1; return 1;
} }

4
e_mod_main.h
View File

@ -34,8 +34,8 @@ struct _Config_Item
EAPI extern E_Module_Api e_modapi; EAPI extern E_Module_Api e_modapi;
EAPI void *e_modapi_init(E_Module *m); EAPI void *e_modapi_init(E_Module *m);
EAPI int e_modapi_shutdown(E_Module *m); EAPI int e_modapi_shutdown(E_Module *m);
EAPI int e_modapi_save(E_Module *m); EAPI int e_modapi_save(E_Module *m);
void _config_tclock_module(Config_Item *ci); void _config_tclock_module(Config_Item *ci);
void _tclock_config_updated(Config_Item *ci); void _tclock_config_updated(Config_Item *ci);