From: Enlightenment C. <no...@cv...> - 2006-07-14 13:54:20
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: Makefile.am Log Message: Remove autogen.sh from make distcheck, thanks rephorm and dj2 :) =================================================================== RCS file: /cvs/e/e_modules/mem/Makefile.am,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- Makefile.am 14 Jul 2006 18:40:45 -0000 1.14 +++ Makefile.am 14 Jul 2006 18:54:19 -0000 1.15 @@ -17,7 +17,6 @@ EXTRA_DIST= e_modules-mem.spec \ $(files_DATA) \ mem.edc \ - autogen.sh \ real_00.png \ real_01.png \ real_02.png \ |
From: Enlightenment C. <no...@cv...> - 2006-07-17 19:00:11
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: e_mod_config.c e_mod_main.c machdep_freebsd.c machdep_linux.c Log Message: Indent =================================================================== RCS file: /cvs/e/e_modules/mem/e_mod_config.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- e_mod_config.c 17 Jul 2006 23:21:51 -0000 1.10 +++ e_mod_config.c 18 Jul 2006 00:00:05 -0000 1.11 @@ -3,125 +3,137 @@ struct _E_Config_Dialog_Data { - double poll_time; - int always_text; - int show_percent; + double poll_time; + int always_text; + int show_percent; #ifdef __linux__ - int real_ignore_buffers; - int real_ignore_cached; + int real_ignore_buffers; + int real_ignore_cached; #endif }; /* Protos */ -static void *_create_data(E_Config_Dialog *cfd); -static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); -static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static void _fill_data(Config_Item *ci, E_Config_Dialog_Data *cfdata); +static void *_create_data (E_Config_Dialog * cfd); +static void _free_data (E_Config_Dialog * cfd, E_Config_Dialog_Data * cfdata); +static Evas_Object *_basic_create_widgets (E_Config_Dialog * cfd, Evas * evas, + E_Config_Dialog_Data * cfdata); +static int _basic_apply_data (E_Config_Dialog * cfd, + E_Config_Dialog_Data * cfdata); +static void _fill_data (Config_Item * ci, E_Config_Dialog_Data * cfdata); /* Config Calls */ void -_config_mem_module(Config_Item *ci) +_config_mem_module (Config_Item * ci) { - E_Config_Dialog *cfd; - E_Config_Dialog_View *v; - E_Container *con; - char buf[4096]; - - v = E_NEW(E_Config_Dialog_View, 1); - - v->create_cfdata = _create_data; - v->free_cfdata = _free_data; - v->basic.apply_cfdata = _basic_apply_data; - v->basic.create_widgets = _basic_create_widgets; - - snprintf(buf, sizeof(buf), "%s/module.eap", e_module_dir_get(mem_config->module)); - con = e_container_current_get(e_manager_current_get()); - cfd = e_config_dialog_new(con, D_("Mem Configuration"), buf, 0, v, ci); - mem_config->config_dialog = cfd; + E_Config_Dialog *cfd; + E_Config_Dialog_View *v; + E_Container *con; + char buf[4096]; + + v = E_NEW (E_Config_Dialog_View, 1); + + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _basic_apply_data; + v->basic.create_widgets = _basic_create_widgets; + + snprintf (buf, sizeof (buf), "%s/module.eap", + e_module_dir_get (mem_config->module)); + con = e_container_current_get (e_manager_current_get ()); + cfd = e_config_dialog_new (con, D_ ("Mem Configuration"), buf, 0, v, ci); + mem_config->config_dialog = cfd; } static void -_fill_data(Config_Item *ci, E_Config_Dialog_Data *cfdata) +_fill_data (Config_Item * ci, E_Config_Dialog_Data * cfdata) { - cfdata->poll_time = ci->poll_time; + cfdata->poll_time = ci->poll_time; #ifdef __linux__ - cfdata->real_ignore_buffers = ci->real_ignore_buffers; - cfdata->real_ignore_cached = ci->real_ignore_cached; + cfdata->real_ignore_buffers = ci->real_ignore_buffers; + cfdata->real_ignore_cached = ci->real_ignore_cached; #endif // cfdata->show_text = c->conf->show_text; - cfdata->always_text = ci->always_text; - cfdata->show_percent = ci->show_percent; + cfdata->always_text = ci->always_text; + cfdata->show_percent = ci->show_percent; } static void * -_create_data(E_Config_Dialog *cfd) +_create_data (E_Config_Dialog * cfd) { - E_Config_Dialog_Data *cfdata; - Config_Item *ci; + E_Config_Dialog_Data *cfdata; + Config_Item *ci; - ci = cfd->data; - cfdata = E_NEW(E_Config_Dialog_Data, 1); + ci = cfd->data; + cfdata = E_NEW (E_Config_Dialog_Data, 1); - _fill_data(ci, cfdata); - return cfdata; + _fill_data (ci, cfdata); + return cfdata; } static void -_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) +_free_data (E_Config_Dialog * cfd, E_Config_Dialog_Data * cfdata) { - if (!mem_config) - return; - mem_config->config_dialog = NULL; - free(cfdata); - cfdata = NULL; + if (!mem_config) + return; + mem_config->config_dialog = NULL; + free (cfdata); + cfdata = NULL; } static Evas_Object * -_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create_widgets (E_Config_Dialog * cfd, Evas * evas, + E_Config_Dialog_Data * cfdata) { - Evas_Object *o, *of, *ob; - E_Radio_Group *rg; - - o = e_widget_list_add(evas, 0, 0); - of = e_widget_framelist_add(evas, D_("General Settings"), 0); - rg = e_widget_radio_group_new(&(cfdata->always_text)); - ob = e_widget_radio_add(evas, D_("Always Show Text"), 1, rg); - e_widget_framelist_object_append(of, ob); - ob = e_widget_radio_add(evas, D_("Show Text On Mouse Over"), 0, rg); - e_widget_framelist_object_append(of, ob); - ob = e_widget_check_add(evas, D_("Show Text As Percent"), &(cfdata->show_percent)); - e_widget_framelist_object_append(of, ob); + Evas_Object *o, *of, *ob; + E_Radio_Group *rg; + + o = e_widget_list_add (evas, 0, 0); + of = e_widget_framelist_add (evas, D_ ("General Settings"), 0); + rg = e_widget_radio_group_new (&(cfdata->always_text)); + ob = e_widget_radio_add (evas, D_ ("Always Show Text"), 1, rg); + e_widget_framelist_object_append (of, ob); + ob = e_widget_radio_add (evas, D_ ("Show Text On Mouse Over"), 0, rg); + e_widget_framelist_object_append (of, ob); + ob = + e_widget_check_add (evas, D_ ("Show Text As Percent"), + &(cfdata->show_percent)); + e_widget_framelist_object_append (of, ob); #ifdef __linux__ - ob = e_widget_check_add(evas, D_("Ignore Buffers"), &(cfdata->real_ignore_buffers)); - e_widget_framelist_object_append(of, ob); - ob = e_widget_check_add(evas, D_("Ignore Cached"), &(cfdata->real_ignore_cached)); - e_widget_framelist_object_append(of, ob); + ob = + e_widget_check_add (evas, D_ ("Ignore Buffers"), + &(cfdata->real_ignore_buffers)); + e_widget_framelist_object_append (of, ob); + ob = + e_widget_check_add (evas, D_ ("Ignore Cached"), + &(cfdata->real_ignore_cached)); + e_widget_framelist_object_append (of, ob); #endif - ob = e_widget_label_add(evas, D_("Check Interval:")); - e_widget_framelist_object_append(of, ob); - ob = e_widget_slider_add(evas, 1, 0, _("%1.0f seconds"), 1.0, 60.0, 1.0, 0, &(cfdata->poll_time), NULL, 150); - e_widget_framelist_object_append(of, ob); - e_widget_list_object_append(o, of, 1, 1, 0.5); + ob = e_widget_label_add (evas, D_ ("Check Interval:")); + e_widget_framelist_object_append (of, ob); + ob = + e_widget_slider_add (evas, 1, 0, _("%1.0f seconds"), 1.0, 60.0, 1.0, 0, + &(cfdata->poll_time), NULL, 150); + e_widget_framelist_object_append (of, ob); + e_widget_list_object_append (o, of, 1, 1, 0.5); - return o; + return o; } static int -_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) +_basic_apply_data (E_Config_Dialog * cfd, E_Config_Dialog_Data * cfdata) { - Config_Item *ci; - - ci = cfd->data; - ci->poll_time = cfdata->poll_time; + Config_Item *ci; + + ci = cfd->data; + ci->poll_time = cfdata->poll_time; #ifdef __linux__ - ci->real_ignore_buffers = cfdata->real_ignore_buffers; - ci->real_ignore_cached = cfdata->real_ignore_cached; + ci->real_ignore_buffers = cfdata->real_ignore_buffers; + ci->real_ignore_cached = cfdata->real_ignore_cached; #endif - ci->always_text = cfdata->always_text; - ci->show_percent = cfdata->show_percent; - e_config_save_queue(); - _mem_config_updated(ci->id); - - return 1; + ci->always_text = cfdata->always_text; + ci->show_percent = cfdata->show_percent; + e_config_save_queue (); + _mem_config_updated (ci->id); + + return 1; } =================================================================== RCS file: /cvs/e/e_modules/mem/e_mod_main.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -3 -r1.36 -r1.37 --- e_mod_main.c 17 Jul 2006 23:21:51 -0000 1.36 +++ e_mod_main.c 18 Jul 2006 00:00:05 -0000 1.37 @@ -4,432 +4,457 @@ typedef struct _Instance Instance; typedef struct _Mem Mem; -struct _Instance +struct _Instance { - E_Gadcon_Client *gcc; - Evas_Object *mem_obj; - Mem *mem; - Ecore_Timer *check_timer; + E_Gadcon_Client *gcc; + Evas_Object *mem_obj; + Mem *mem; + Ecore_Timer *check_timer; }; -struct _Mem +struct _Mem { - Instance *inst; - Evas_Object *mem_obj; + Instance *inst; + Evas_Object *mem_obj; }; /* Func Protos for Gadcon */ -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_orient(E_Gadcon_Client *gcc); -static char *_gc_label(void); -static Evas_Object *_gc_icon(Evas *evas); +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_orient (E_Gadcon_Client * gcc); +static char *_gc_label (void); +static Evas_Object *_gc_icon (Evas * evas); /* Func Protos for Module */ -static void _mem_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info); -static void _mem_cb_mouse_in(void *data, Evas *e, Evas_Object *obj, void *event_info); -static void _mem_cb_mouse_out(void *data, Evas *e, Evas_Object *obj, void *event_info); -static void _mem_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi); -static void _mem_menu_cb_post(void *data, E_Menu *m); -static Config_Item *_mem_config_item_get(const char *id); -static Mem *_mem_new(Evas *evas); -static void _mem_free(Mem *mem); -static int _mem_cb_check(void *data); +static void _mem_cb_mouse_down (void *data, Evas * e, Evas_Object * obj, + void *event_info); +static void _mem_cb_mouse_in (void *data, Evas * e, Evas_Object * obj, + void *event_info); +static void _mem_cb_mouse_out (void *data, Evas * e, Evas_Object * obj, + void *event_info); +static void _mem_menu_cb_configure (void *data, E_Menu * m, E_Menu_Item * mi); +static void _mem_menu_cb_post (void *data, E_Menu * m); +static Config_Item *_mem_config_item_get (const char *id); +static Mem *_mem_new (Evas * evas); +static void _mem_free (Mem * mem); +static int _mem_cb_check (void *data); static E_Config_DD *conf_edd = NULL; static E_Config_DD *conf_item_edd = NULL; Config *mem_config = NULL; -static const E_Gadcon_Client_Class _gc_class = -{ - GADCON_CLIENT_CLASS_VERSION, - "mem", {_gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon} +static const E_Gadcon_Client_Class _gc_class = { + GADCON_CLIENT_CLASS_VERSION, + "mem", {_gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon} }; 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) { - E_Gadcon_Client *gcc; - Evas_Object *o; - Instance *inst; - Config_Item *ci; - Mem *mem; - - inst = E_NEW(Instance, 1); - - ci = _mem_config_item_get(id); - if (!ci->id) ci->id = evas_stringshare_add(id); - - mem = _mem_new(gc->evas); - mem->inst = inst; - inst->mem = mem; - - o = mem->mem_obj; - gcc = e_gadcon_client_new(gc, name, id, style, o); - gcc->data = inst; - inst->gcc = gcc; - inst->mem_obj = o; - - evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _mem_cb_mouse_down, inst); - evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_IN, _mem_cb_mouse_in, inst); - evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_OUT, _mem_cb_mouse_out, inst); - - if (ci->always_text) - edje_object_signal_emit(inst->mem_obj, "label_active", ""); - - _mem_cb_check(inst); - - inst->check_timer = ecore_timer_add(ci->poll_time, _mem_cb_check, inst); - mem_config->instances = evas_list_append(mem_config->instances, inst); - return gcc; + E_Gadcon_Client *gcc; + Evas_Object *o; + Instance *inst; + Config_Item *ci; + Mem *mem; + + inst = E_NEW (Instance, 1); + + ci = _mem_config_item_get (id); + if (!ci->id) + ci->id = evas_stringshare_add (id); + + mem = _mem_new (gc->evas); + mem->inst = inst; + inst->mem = mem; + + o = mem->mem_obj; + gcc = e_gadcon_client_new (gc, name, id, style, o); + gcc->data = inst; + inst->gcc = gcc; + inst->mem_obj = o; + + evas_object_event_callback_add (o, EVAS_CALLBACK_MOUSE_DOWN, + _mem_cb_mouse_down, inst); + evas_object_event_callback_add (o, EVAS_CALLBACK_MOUSE_IN, _mem_cb_mouse_in, + inst); + evas_object_event_callback_add (o, EVAS_CALLBACK_MOUSE_OUT, + _mem_cb_mouse_out, inst); + + if (ci->always_text) + edje_object_signal_emit (inst->mem_obj, "label_active", ""); + + _mem_cb_check (inst); + + inst->check_timer = ecore_timer_add (ci->poll_time, _mem_cb_check, inst); + mem_config->instances = evas_list_append (mem_config->instances, inst); + return gcc; } static void -_gc_orient(E_Gadcon_Client *gcc) +_gc_orient (E_Gadcon_Client * gcc) { - e_gadcon_client_aspect_set(gcc, 16, 16); - e_gadcon_client_min_size_set(gcc, 16, 16); + e_gadcon_client_aspect_set (gcc, 16, 16); + e_gadcon_client_min_size_set (gcc, 16, 16); } static char * -_gc_label(void) +_gc_label (void) { - return D_("Mem"); + return D_ ("Mem"); } static Evas_Object * -_gc_icon(Evas *evas) +_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(mem_config->module)); - edje_object_file_set(o, buf, "icon"); - return o; + Evas_Object *o; + char buf[4096]; + + o = edje_object_add (evas); + snprintf (buf, sizeof (buf), "%s/module.eap", + e_module_dir_get (mem_config->module)); + edje_object_file_set (o, buf, "icon"); + return o; } static void -_gc_shutdown(E_Gadcon_Client *gcc) +_gc_shutdown (E_Gadcon_Client * gcc) { - Instance *inst; - - inst = gcc->data; - if (inst->check_timer) ecore_timer_del(inst->check_timer); - mem_config->instances = evas_list_remove(mem_config->instances, inst); - _mem_free(inst->mem); - free(inst); - inst = NULL; + Instance *inst; + + inst = gcc->data; + if (inst->check_timer) + ecore_timer_del (inst->check_timer); + mem_config->instances = evas_list_remove (mem_config->instances, inst); + _mem_free (inst->mem); + free (inst); + inst = NULL; } static void -_mem_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info) +_mem_cb_mouse_down (void *data, Evas * e, Evas_Object * obj, void *event_info) { - Instance *inst; - Evas_Event_Mouse_Down *ev; + Instance *inst; + Evas_Event_Mouse_Down *ev; - inst = data; - ev = event_info; - if ((ev->button == 3) && (!mem_config->menu)) - { - E_Menu *mn; - E_Menu_Item *mi; - int x, y, w, h; - - mn = e_menu_new(); - e_menu_post_deactivate_callback_set(mn, _mem_menu_cb_post, inst); - mem_config->menu = mn; - - mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, D_("Configuration")); - e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration"); - e_menu_item_callback_set(mi, _mem_menu_cb_configure, inst); - - mi = e_menu_item_new(mn); - e_menu_item_separator_set(mi, 1); - - e_gadcon_client_util_menu_items_append(inst->gcc, mn, 0); - e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &x, &y, &w, &h); - e_menu_activate_mouse(mn, - e_util_zone_current_get(e_manager_current_get()), - x + ev->output.x, y + ev->output.y, 1, 1, E_MENU_POP_DIRECTION_DOWN, ev->timestamp); - evas_event_feed_mouse_up(inst->gcc->gadcon->evas, ev->button, EVAS_BUTTON_NONE, ev->timestamp, NULL); - } + inst = data; + ev = event_info; + if ((ev->button == 3) && (!mem_config->menu)) + { + E_Menu *mn; + E_Menu_Item *mi; + int x, y, w, h; + + mn = e_menu_new (); + e_menu_post_deactivate_callback_set (mn, _mem_menu_cb_post, inst); + mem_config->menu = mn; + + mi = e_menu_item_new (mn); + e_menu_item_label_set (mi, D_ ("Configuration")); + e_util_menu_item_edje_icon_set (mi, "enlightenment/configuration"); + e_menu_item_callback_set (mi, _mem_menu_cb_configure, inst); + + mi = e_menu_item_new (mn); + e_menu_item_separator_set (mi, 1); + + e_gadcon_client_util_menu_items_append (inst->gcc, mn, 0); + e_gadcon_canvas_zone_geometry_get (inst->gcc->gadcon, &x, &y, &w, &h); + e_menu_activate_mouse (mn, + e_util_zone_current_get (e_manager_current_get + ()), x + ev->output.x, + y + ev->output.y, 1, 1, + E_MENU_POP_DIRECTION_DOWN, ev->timestamp); + evas_event_feed_mouse_up (inst->gcc->gadcon->evas, ev->button, + EVAS_BUTTON_NONE, ev->timestamp, NULL); + } } static void -_mem_menu_cb_post(void *data, E_Menu *m) +_mem_menu_cb_post (void *data, E_Menu * m) { - if (!mem_config->menu) return; - e_object_del(E_OBJECT(mem_config->menu)); - mem_config->menu = NULL; + if (!mem_config->menu) + return; + e_object_del (E_OBJECT (mem_config->menu)); + mem_config->menu = NULL; } static void -_mem_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi) +_mem_menu_cb_configure (void *data, E_Menu * m, E_Menu_Item * mi) { - Instance *inst; - Config_Item *ci; - - inst = data; - ci = _mem_config_item_get(inst->gcc->id); - _config_mem_module(ci); + Instance *inst; + Config_Item *ci; + + inst = data; + ci = _mem_config_item_get (inst->gcc->id); + _config_mem_module (ci); } void -_mem_config_updated(const char *id) +_mem_config_updated (const char *id) { - Evas_List *l; - Config_Item *ci; + Evas_List *l; + Config_Item *ci; - if (!mem_config) return; - ci = _mem_config_item_get(id); - for (l = mem_config->instances; l; l = l->next) - { - Instance *inst; - - inst = l->data; - if (!inst->gcc->id) continue; - - if (!strcmp(inst->gcc->id, ci->id)) - { - if (inst->check_timer) ecore_timer_del(inst->check_timer); - inst->check_timer = ecore_timer_add((double)ci->poll_time, _mem_cb_check, inst); - if (ci->always_text) - edje_object_signal_emit(inst->mem_obj, "label_active", ""); - else - edje_object_signal_emit(inst->mem_obj, "label_passive", ""); - - break; - } - } + if (!mem_config) + return; + ci = _mem_config_item_get (id); + for (l = mem_config->instances; l; l = l->next) + { + Instance *inst; + + inst = l->data; + if (!inst->gcc->id) + continue; + + if (!strcmp (inst->gcc->id, ci->id)) + { + if (inst->check_timer) + ecore_timer_del (inst->check_timer); + inst->check_timer = + ecore_timer_add ((double) ci->poll_time, _mem_cb_check, inst); + if (ci->always_text) + edje_object_signal_emit (inst->mem_obj, "label_active", ""); + else + edje_object_signal_emit (inst->mem_obj, "label_passive", ""); + + break; + } + } } static Config_Item * -_mem_config_item_get(const char *id) +_mem_config_item_get (const char *id) { - Evas_List *l; - Config_Item *ci; + Evas_List *l; + Config_Item *ci; - for (l = mem_config->items; l; l = l->next) - { - ci = l->data; - if (!ci->id) continue; - if (!strcmp(ci->id, id)) return ci; - } - ci = E_NEW(Config_Item, 1); - ci->id = evas_stringshare_add(id); - ci->poll_time = 1.0; - ci->always_text = 0; - ci->show_percent = 1; + for (l = mem_config->items; l; l = l->next) + { + ci = l->data; + if (!ci->id) + continue; + if (!strcmp (ci->id, id)) + return ci; + } + ci = E_NEW (Config_Item, 1); + ci->id = evas_stringshare_add (id); + ci->poll_time = 1.0; + ci->always_text = 0; + ci->show_percent = 1; #ifdef __linux__ - ci->real_ignore_buffers = 0; - ci->real_ignore_cached = 0; + ci->real_ignore_buffers = 0; + ci->real_ignore_cached = 0; #endif - mem_config->items = evas_list_append(mem_config->items, ci); - return ci; + mem_config->items = evas_list_append (mem_config->items, ci); + return ci; } -EAPI E_Module_Api e_modapi = -{ - E_MODULE_API_VERSION, - "Mem" +EAPI E_Module_Api e_modapi = { + E_MODULE_API_VERSION, + "Mem" }; EAPI void * -e_modapi_init(E_Module *m) +e_modapi_init (E_Module * m) { - bindtextdomain(PACKAGE, LOCALEDIR); - bind_textdomain_codeset(PACKAGE, "UTF-8"); + bindtextdomain (PACKAGE, LOCALEDIR); + bind_textdomain_codeset (PACKAGE, "UTF-8"); - conf_item_edd = E_CONFIG_DD_NEW("Mem_Config_Item", Config_Item); + conf_item_edd = E_CONFIG_DD_NEW ("Mem_Config_Item", Config_Item); #undef T #undef D #define T Config_Item #define D conf_item_edd - E_CONFIG_VAL(D, T, id, STR); - E_CONFIG_VAL(D, T, poll_time, DOUBLE); - E_CONFIG_VAL(D, T, always_text, INT); - E_CONFIG_VAL(D, T, show_percent, INT); + E_CONFIG_VAL (D, T, id, STR); + E_CONFIG_VAL (D, T, poll_time, DOUBLE); + E_CONFIG_VAL (D, T, always_text, INT); + E_CONFIG_VAL (D, T, show_percent, INT); #ifdef __linux__ - E_CONFIG_VAL(D, T, real_ignore_buffers, INT); - E_CONFIG_VAL(D, T, real_ignore_cached, INT); + E_CONFIG_VAL (D, T, real_ignore_buffers, INT); + E_CONFIG_VAL (D, T, real_ignore_cached, INT); #endif - conf_edd = E_CONFIG_DD_NEW("Mem_Config", Config); + conf_edd = E_CONFIG_DD_NEW ("Mem_Config", Config); #undef T #undef D #define T Config #define D conf_edd - E_CONFIG_LIST(D, T, items, conf_item_edd); + E_CONFIG_LIST (D, T, items, conf_item_edd); - mem_config = e_config_domain_load("module.mem", conf_edd); - if (!mem_config) - { - Config_Item *ci; - - mem_config = E_NEW(Config, 1); - - ci = E_NEW(Config_Item, 1); - ci->id = evas_stringshare_add("0"); - ci->poll_time = 1.0; - ci->always_text = 0; - ci->show_percent = 1; + mem_config = e_config_domain_load ("module.mem", conf_edd); + if (!mem_config) + { + Config_Item *ci; + + mem_config = E_NEW (Config, 1); + + ci = E_NEW (Config_Item, 1); + ci->id = evas_stringshare_add ("0"); + ci->poll_time = 1.0; + ci->always_text = 0; + ci->show_percent = 1; #ifdef __linux__ - ci->real_ignore_buffers = 0; - ci->real_ignore_cached = 0; + ci->real_ignore_buffers = 0; + ci->real_ignore_cached = 0; #endif - mem_config->items = evas_list_append(mem_config->items, ci); - } - mem_config->module = m; - e_gadcon_provider_register(&_gc_class); - return m; + mem_config->items = evas_list_append (mem_config->items, ci); + } + mem_config->module = m; + e_gadcon_provider_register (&_gc_class); + return m; } EAPI int -e_modapi_shutdown(E_Module *m) +e_modapi_shutdown (E_Module * m) { - mem_config->module = NULL; - e_gadcon_provider_unregister(&_gc_class); + mem_config->module = NULL; + e_gadcon_provider_unregister (&_gc_class); - if (mem_config->config_dialog) - e_object_del(E_OBJECT(mem_config->config_dialog)); - if (mem_config->menu) - { - e_menu_post_deactivate_callback_set(mem_config->menu, NULL, NULL); - e_object_del(E_OBJECT(mem_config->menu)); - mem_config->menu = NULL; - } - while (mem_config->items) - { - Config_Item *ci; - - ci = mem_config->items->data; - mem_config->items = evas_list_remove_list(mem_config->items, mem_config->items); - if (ci->id) evas_stringshare_del(ci->id); - free(ci); - ci = NULL; - } - free(mem_config); - mem_config = NULL; - E_CONFIG_DD_FREE(conf_item_edd); - E_CONFIG_DD_FREE(conf_edd); - return 1; + if (mem_config->config_dialog) + e_object_del (E_OBJECT (mem_config->config_dialog)); + if (mem_config->menu) + { + e_menu_post_deactivate_callback_set (mem_config->menu, NULL, NULL); + e_object_del (E_OBJECT (mem_config->menu)); + mem_config->menu = NULL; + } + while (mem_config->items) + { + Config_Item *ci; + + ci = mem_config->items->data; + mem_config->items = + evas_list_remove_list (mem_config->items, mem_config->items); + if (ci->id) + evas_stringshare_del (ci->id); + free (ci); + ci = NULL; + } + free (mem_config); + mem_config = NULL; + E_CONFIG_DD_FREE (conf_item_edd); + E_CONFIG_DD_FREE (conf_edd); + return 1; } EAPI int -e_modapi_save(E_Module *m) +e_modapi_save (E_Module * m) { - Evas_List *l; + Evas_List *l; - for (l = mem_config->instances; l; l = l->next) - { - Instance *inst; - Config_Item *ci; - - inst = l->data; - ci = _mem_config_item_get(inst->gcc->id); - if (ci->id) evas_stringshare_del(ci->id); - ci->id = evas_stringshare_add(inst->gcc->id); - } - e_config_domain_save("module.mem", conf_edd, mem_config); - return 1; + for (l = mem_config->instances; l; l = l->next) + { + Instance *inst; + Config_Item *ci; + + inst = l->data; + ci = _mem_config_item_get (inst->gcc->id); + if (ci->id) + evas_stringshare_del (ci->id); + ci->id = evas_stringshare_add (inst->gcc->id); + } + e_config_domain_save ("module.mem", conf_edd, mem_config); + return 1; } EAPI int -e_modapi_about(E_Module *m) +e_modapi_about (E_Module * m) { - e_module_dialog_show(m, D_("Enlightenment Mem Monitor Module"), - D_("This module is used to monitor memory.")); - return 1; + e_module_dialog_show (m, D_ ("Enlightenment Mem Monitor Module"), + D_ ("This module is used to monitor memory.")); + return 1; } static Mem * -_mem_new(Evas *evas) +_mem_new (Evas * evas) { - Mem *mem; - char buf[4096]; + Mem *mem; + char buf[4096]; - mem = E_NEW(Mem, 1); + mem = E_NEW (Mem, 1); - mem->mem_obj = edje_object_add(evas); - snprintf(buf, sizeof(buf), "%s/mem.edj", e_module_dir_get(mem_config->module)); - if (!e_theme_edje_object_set(mem->mem_obj, "base/theme/modules/mem", "modules/mem/main")) - edje_object_file_set(mem->mem_obj, buf, "modules/mem/main"); - evas_object_show(mem->mem_obj); + mem->mem_obj = edje_object_add (evas); + snprintf (buf, sizeof (buf), "%s/mem.edj", + e_module_dir_get (mem_config->module)); + if (!e_theme_edje_object_set + (mem->mem_obj, "base/theme/modules/mem", "modules/mem/main")) + edje_object_file_set (mem->mem_obj, buf, "modules/mem/main"); + evas_object_show (mem->mem_obj); - return mem; + return mem; } static void -_mem_free(Mem *m) +_mem_free (Mem * m) { - evas_object_del(m->mem_obj); - free(m); - m = NULL; + evas_object_del (m->mem_obj); + free (m); + m = NULL; } static void -_mem_cb_mouse_in(void *data, Evas *e, Evas_Object *obj, void *event_info) +_mem_cb_mouse_in (void *data, Evas * e, Evas_Object * obj, void *event_info) { - Instance *inst; + Instance *inst; - inst = data; - edje_object_signal_emit(inst->mem_obj, "label_active", ""); + inst = data; + edje_object_signal_emit (inst->mem_obj, "label_active", ""); } static void -_mem_cb_mouse_out(void *data, Evas *e, Evas_Object *obj, void *event_info) +_mem_cb_mouse_out (void *data, Evas * e, Evas_Object * obj, void *event_info) { - Instance *inst; - Config_Item *ci; + Instance *inst; + Config_Item *ci; - inst = data; - ci = _mem_config_item_get(inst->gcc->id); - if (!ci->always_text) - edje_object_signal_emit(inst->mem_obj, "label_passive", ""); + inst = data; + ci = _mem_config_item_get (inst->gcc->id); + if (!ci->always_text) + edje_object_signal_emit (inst->mem_obj, "label_passive", ""); } static int -_mem_cb_check(void *data) +_mem_cb_check (void *data) { - Instance *inst; - Config_Item *ci; - Edje_Message_Float msg; - int real, swap, total_real, total_swap; - char real_str[100]; - char swap_str[100]; - - inst = data; - ci = _mem_config_item_get(inst->gcc->id); - _mem_get_values(ci, &real, &swap, &total_real, &total_swap); - - if (!ci->show_percent) - { - snprintf(real_str, sizeof(real_str), "Real: %d/%d MB", (real / 1024), (total_real / 1024)); - snprintf(swap_str, sizeof(swap_str), "Swap: %d/%d MB", (swap / 1024), (total_swap / 1024)); - } - else - { - double tr; - - tr = (((double)real / (double)total_real) * 100); - snprintf(real_str, sizeof(real_str), "Real: %1.2f%%", tr); - tr = (((double)swap / (double)total_swap) * 100); - snprintf(swap_str, sizeof(swap_str), "Swap: %1.2f%%", tr); - } - edje_object_part_text_set(inst->mem_obj, "real_label", real_str); - edje_object_part_text_set(inst->mem_obj, "swap_label", swap_str); - - double tr = ((double)real / (double)total_real); - msg.val = tr; - edje_object_message_send(inst->mem_obj, EDJE_MESSAGE_FLOAT, 1, &msg); - - double ts = ((double)swap / (double)total_swap); - msg.val = ts; - edje_object_message_send(inst->mem_obj, EDJE_MESSAGE_FLOAT, 2, &msg); + Instance *inst; + Config_Item *ci; + Edje_Message_Float msg; + int real, swap, total_real, total_swap; + char real_str[100]; + char swap_str[100]; + + inst = data; + ci = _mem_config_item_get (inst->gcc->id); + _mem_get_values (ci, &real, &swap, &total_real, &total_swap); + + if (!ci->show_percent) + { + snprintf (real_str, sizeof (real_str), "Real: %d/%d MB", (real / 1024), + (total_real / 1024)); + snprintf (swap_str, sizeof (swap_str), "Swap: %d/%d MB", (swap / 1024), + (total_swap / 1024)); + } + else + { + double tr; + + tr = (((double) real / (double) total_real) * 100); + snprintf (real_str, sizeof (real_str), "Real: %1.2f%%", tr); + tr = (((double) swap / (double) total_swap) * 100); + snprintf (swap_str, sizeof (swap_str), "Swap: %1.2f%%", tr); + } + edje_object_part_text_set (inst->mem_obj, "real_label", real_str); + edje_object_part_text_set (inst->mem_obj, "swap_label", swap_str); + + double tr = ((double) real / (double) total_real); + msg.val = tr; + edje_object_message_send (inst->mem_obj, EDJE_MESSAGE_FLOAT, 1, &msg); + + double ts = ((double) swap / (double) total_swap); + msg.val = ts; + edje_object_message_send (inst->mem_obj, EDJE_MESSAGE_FLOAT, 2, &msg); - return 1; + return 1; } =================================================================== RCS file: /cvs/e/e_modules/mem/machdep_freebsd.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- machdep_freebsd.c 14 Jun 2006 14:15:39 -0000 1.1 +++ machdep_freebsd.c 18 Jul 2006 00:00:05 -0000 1.2 @@ -12,91 +12,102 @@ #define GETSYSCTL(name, var) getsysctl(name, &(var), sizeof (var)) -static int getsysctl(char *name, void *ptr, size_t len) +static int +getsysctl (char *name, void *ptr, size_t len) { - size_t nlen = len; - if (sysctlbyname(name, ptr, &nlen, NULL, 0) == -1) { - return (1); - } - - if (nlen != len) { - return (1); - } + size_t nlen = len; + if (sysctlbyname (name, ptr, &nlen, NULL, 0) == -1) + { + return (1); + } + + if (nlen != len) + { + return (1); + } - return (0); + return (0); } -static int swapinfo(int *total, int *used) +static int +swapinfo (int *total, int *used) { - int pagesize = getpagesize(); - size_t mibsize, size; - struct xswdev xsw; - int mib[16], n; - int tmp_total, tmp_used; - - *total = 0; - *used = 0; - - mibsize = sizeof mib / sizeof mib[0]; - if (sysctlnametomib("vm.swap_info", mib, &mibsize) == -1) { - warn("sysctlnametomib()"); - return 1; - } + int pagesize = getpagesize (); + size_t mibsize, size; + struct xswdev xsw; + int mib[16], n; + int tmp_total, tmp_used; + + *total = 0; + *used = 0; + + mibsize = sizeof mib / sizeof mib[0]; + if (sysctlnametomib ("vm.swap_info", mib, &mibsize) == -1) + { + warn ("sysctlnametomib()"); + return 1; + } + + for (n = 0;; n++) + { + mib[mibsize] = n; + size = sizeof xsw; + if (sysctl (mib, mibsize + 1, &xsw, &size, NULL, 0) == -1) + break; + + if (xsw.xsw_version != XSWDEV_VERSION) + { + warnx ("xswdev version mismatch"); + return 1; + } + + tmp_total = (long long) xsw.xsw_nblks * pagesize; + tmp_used = (long long) xsw.xsw_used * pagesize; + *total += tmp_total; + *used += tmp_used; + } + if (errno != ENOENT) + warn ("sysctl()"); - for (n = 0; ; n++) { - mib[mibsize] = n; - size = sizeof xsw; - if (sysctl(mib, mibsize + 1, &xsw, &size, NULL, 0) == -1) - break; - - if (xsw.xsw_version != XSWDEV_VERSION) { - warnx("xswdev version mismatch"); - return 1; - } - - tmp_total = (long long)xsw.xsw_nblks * pagesize; - tmp_used = (long long)xsw.xsw_used * pagesize; - *total += tmp_total; - *used += tmp_used; - } - if (errno != ENOENT) - warn("sysctl()"); - - return 0; + return 0; } void -_mem_get_values(ci, phys_used, sw_used, phys_total, sw_total) - Config_Item *ci; - int *phys_used; - int *sw_used; - int *phys_total; - int *sw_total; +_mem_get_values (ci, phys_used, sw_used, phys_total, sw_total) + Config_Item *ci; + int *phys_used; + int *sw_used; + int *phys_total; + int *sw_total; { - int total_pages, inactive_pages, free_pages; - - int pagesize = getpagesize(); + int total_pages, inactive_pages, free_pages; - if (GETSYSCTL("vm.stats.vm.v_page_count", total_pages)) { - warnx("can't read sysctl \"vm.stats.vm.v_page_count\""); - return; - } - - if (GETSYSCTL("vm.stats.vm.v_free_count", free_pages)) { - warnx("can't read sysctl \"vm.stats.vm.v_free_count\""); - return; - } + int pagesize = getpagesize (); - if (GETSYSCTL("vm.stats.vm.v_inactive_count", inactive_pages)) { - warnx("can't read sysctl \"vm.stats.vm.v_inactive_count\""); - return; - } - - *phys_total = (total_pages * pagesize) >> 10; - *phys_used = ((total_pages - free_pages - inactive_pages) * pagesize) >> 10; - - if ((swapinfo(sw_total, sw_used)) != 0) { - *sw_total = 0; - *sw_used = 0; - } + if (GETSYSCTL ("vm.stats.vm.v_page_count", total_pages)) + { + warnx ("can't read sysctl \"vm.stats.vm.v_page_count\""); + return; + } + + if (GETSYSCTL ("vm.stats.vm.v_free_count", free_pages)) + { + warnx ("can't read sysctl \"vm.stats.vm.v_free_count\""); + return; + } + + if (GETSYSCTL ("vm.stats.vm.v_inactive_count", inactive_pages)) + { + warnx ("can't read sysctl \"vm.stats.vm.v_inactive_count\""); + return; + } + + *phys_total = (total_pages * pagesize) >> 10; + *phys_used = ((total_pages - free_pages - inactive_pages) * pagesize) >> 10; + + if ((swapinfo (sw_total, sw_used)) != 0) + { + *sw_total = 0; + *sw_used = 0; + } } =================================================================== RCS file: /cvs/e/e_modules/mem/machdep_linux.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- machdep_linux.c 14 Jun 2006 14:15:39 -0000 1.1 +++ machdep_linux.c 18 Jul 2006 00:00:05 -0000 1.2 @@ -2,62 +2,68 @@ #include "e_mod_main.h" void -_mem_get_values(Config_Item *ci, int *real, int *swap, int *total_real, int *total_swap) +_mem_get_values (Config_Item * ci, int *real, int *swap, int *total_real, + int *total_swap) { - FILE *pmeminfo = NULL; - int cursor = 0; - char *line, *field; - unsigned char c; - long int value = 0, mtotal = 0, stotal = 0, mfree = 0, sfree = 0; - ldiv_t ldresult; - long int liresult; - - if (!(pmeminfo = fopen("/proc/meminfo", "r"))) - { - fprintf(stderr, "can't open /proc/meminfo"); - return; - } - - line = (char *)calloc(64, sizeof(char)); - while (fscanf(pmeminfo, "%c", &c) != EOF) - { - if (c != '\n') line[cursor++] = c; - else - { - field = (char *)malloc(strlen(line) * sizeof(char)); - sscanf(line, "%s %ld kB", field, &value); - if (!strcmp(field, "MemTotal:")) mtotal = value; - else if (!strcmp(field, "MemFree:")) mfree = value; - else if (ci->real_ignore_buffers && (!strcmp(field, "Buffers:"))) - mfree += value; - else if (ci->real_ignore_cached && (!strcmp(field, "Cached:"))) - mfree += value; - else if (ci->real_ignore_cached && (!strcmp(field, "SwapCached:"))) - sfree += value; - else if (!strcmp(field, "SwapTotal:")) stotal = value; - else if (!strcmp(field, "SwapFree:")) sfree = value; - - free(line); - free(field); - cursor = 0; - line = (char *)calloc(64, sizeof(char)); - } - } - fclose(pmeminfo); - - if (stotal >= 1) - { - ldresult = ldiv(stotal, 100); - liresult = ldresult.quot; - ldresult = ldiv((stotal - sfree), liresult); - } - - ldresult = ldiv(mtotal, 100); - liresult = ldresult.quot; - ldresult = ldiv((mtotal - mfree), liresult); - - *real = (mtotal - mfree); - *swap = (stotal - sfree); - *total_real = mtotal; - *total_swap = stotal; + FILE *pmeminfo = NULL; + int cursor = 0; + char *line, *field; + unsigned char c; + long int value = 0, mtotal = 0, stotal = 0, mfree = 0, sfree = 0; + ldiv_t ldresult; + long int liresult; + + if (!(pmeminfo = fopen ("/proc/meminfo", "r"))) + { + fprintf (stderr, "can't open /proc/meminfo"); + return; + } + + line = (char *) calloc (64, sizeof (char)); + while (fscanf (pmeminfo, "%c", &c) != EOF) + { + if (c != '\n') + line[cursor++] = c; + else + { + field = (char *) malloc (strlen (line) * sizeof (char)); + sscanf (line, "%s %ld kB", field, &value); + if (!strcmp (field, "MemTotal:")) + mtotal = value; + else if (!strcmp (field, "MemFree:")) + mfree = value; + else if (ci->real_ignore_buffers && (!strcmp (field, "Buffers:"))) + mfree += value; + else if (ci->real_ignore_cached && (!strcmp (field, "Cached:"))) + mfree += value; + else if (ci->real_ignore_cached && (!strcmp (field, "SwapCached:"))) + sfree += value; + else if (!strcmp (field, "SwapTotal:")) + stotal = value; + else if (!strcmp (field, "SwapFree:")) + sfree = value; + + free (line); + free (field); + cursor = 0; + line = (char *) calloc (64, sizeof (char)); + } + } + fclose (pmeminfo); + + if (stotal >= 1) + { + ldresult = ldiv (stotal, 100); + liresult = ldresult.quot; + ldresult = ldiv ((stotal - sfree), liresult); + } + + ldresult = ldiv (mtotal, 100); + liresult = ldresult.quot; + ldresult = ldiv ((mtotal - mfree), liresult); + + *real = (mtotal - mfree); + *swap = (stotal - sfree); + *total_real = mtotal; + *total_swap = stotal; } |
From: Enlightenment C. <no...@cv...> - 2006-07-24 20:39:51
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: configure.in Log Message: Patch from Marcus Huwe for installation on x86_64 =================================================================== RCS file: /cvs/e/e_modules/mem/configure.in,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- configure.in 14 Jun 2006 14:15:39 -0000 1.10 +++ configure.in 25 Jul 2006 01:39:47 -0000 1.11 @@ -106,7 +106,7 @@ datadir="${HOME}/.e/e/modules/${PACKAGE}" else AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/lib/enlightenment/modules/${PACKAGE}", "Package installed data destination") - datadir="${prefix}/lib/enlightenment/modules/${PACKAGE}" + datadir="${libdir}/enlightenment/modules/${PACKAGE}" fi AC_PREFIX_DEFAULT(${HOME}/.e/e) |
From: Enlightenment C. <no...@cv...> - 2006-07-24 22:52:30
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: configure.in Log Message: Bad Marcus, no cookie :) . Fixed x86_64 install patch. =================================================================== RCS file: /cvs/e/e_modules/mem/configure.in,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- configure.in 25 Jul 2006 01:39:47 -0000 1.11 +++ configure.in 25 Jul 2006 03:52:29 -0000 1.12 @@ -105,7 +105,7 @@ AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${HOME}/.e/e/modules/${PACKAGE}", "Package installed data destination") datadir="${HOME}/.e/e/modules/${PACKAGE}" else - AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/lib/enlightenment/modules/${PACKAGE}", "Package installed data destination") + AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${libdir}/lib/enlightenment/modules/${PACKAGE}", "Package installed data destination") datadir="${libdir}/enlightenment/modules/${PACKAGE}" fi |
From: Enlightenment C. <no...@cv...> - 2006-07-25 08:32:24
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: configure.in Log Message: Fix minor oversight with x86_64 libdir. Thanks Sebastian =================================================================== RCS file: /cvs/e/e_modules/mem/configure.in,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- configure.in 25 Jul 2006 03:52:29 -0000 1.12 +++ configure.in 25 Jul 2006 13:32:23 -0000 1.13 @@ -105,7 +105,7 @@ AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${HOME}/.e/e/modules/${PACKAGE}", "Package installed data destination") datadir="${HOME}/.e/e/modules/${PACKAGE}" else - AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${libdir}/lib/enlightenment/modules/${PACKAGE}", "Package installed data destination") + AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${libdir}/enlightenment/modules/${PACKAGE}", "Package installed data destination") datadir="${libdir}/enlightenment/modules/${PACKAGE}" fi |
From: Enlightenment C. <no...@cv...> - 2006-09-02 12:39:25
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: Makefile.am Log Message: Added make uninstall rule =================================================================== RCS file: /cvs/e/e_modules/mem/Makefile.am,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- Makefile.am 14 Jul 2006 18:54:19 -0000 1.15 +++ Makefile.am 2 Sep 2006 12:39:24 -0000 1.16 @@ -75,4 +75,6 @@ clean-local: rm -rf *.edj *~ +uninstall: + rm -rf $(datadir) |
From: Enlightenment C. <no...@cv...> - 2006-09-04 21:14:52
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: mem.edc Log Message: Fix text clipping problem. =================================================================== RCS file: /cvs/e/e_modules/mem/mem.edc,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- mem.edc 9 Aug 2006 07:08:36 -0000 1.17 +++ mem.edc 4 Sep 2006 21:14:50 -0000 1.18 @@ -226,7 +226,6 @@ { name: "real_label"; type: TEXT; - clip_to: "fade_clip"; effect: SOFT_SHADOW; description { @@ -384,7 +383,6 @@ { name: "swap_label"; type: TEXT; - clip_to: "fade_clip"; effect: SOFT_SHADOW; description { |
From: Enlightenment C. <no...@cv...> - 2006-09-14 14:33:04
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: e_mod_main.c Log Message: Fixer-upper on the text jitteries. =================================================================== RCS file: /cvs/e/e_modules/mem/e_mod_main.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -3 -r1.38 -r1.39 --- e_mod_main.c 9 Aug 2006 07:47:27 -0000 1.38 +++ e_mod_main.c 14 Sep 2006 14:33:02 -0000 1.39 @@ -399,9 +399,12 @@ _mem_cb_mouse_in (void *data, Evas * e, Evas_Object * obj, void *event_info) { Instance *inst; + Config_Item *ci; inst = data; - edje_object_signal_emit (inst->mem_obj, "label_active", ""); + ci = _mem_config_item_get (inst->gcc->id); + if (!ci->always_text) + edje_object_signal_emit (inst->mem_obj, "label_active", ""); } static void |
From: Enlightenment C. <no...@cv...> - 2006-10-11 20:54:51
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: mem.edc Log Message: Added color class for mem module. =================================================================== RCS file: /cvs/e/e_modules/mem/mem.edc,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- mem.edc 4 Sep 2006 21:14:50 -0000 1.18 +++ mem.edc 11 Oct 2006 20:54:50 -0000 1.19 @@ -262,6 +262,7 @@ visible: 1; color: 255 255 255 255; color3: 0 0 0 42; + color_class: "module_label"; } } part @@ -419,6 +420,7 @@ visible: 1; color: 255 255 255 255; color3: 0 0 0 42; + color_class: "module_label"; } } } @@ -433,7 +435,6 @@ transition: SINUSOIDAL 0.5; target: "real_label"; target: "swap_label"; - //after: "go_passive2"; } program { @@ -442,7 +443,6 @@ source: ""; action: ACTION_STOP; target: "go_active"; - //after: "go_passive2"; } program { |
From: Enlightenment C. <no...@cv...> - 2007-03-30 20:30:36
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: ABOUT-NLS Makefile.am autogen.sh configure.in e_mod_main.c Added Files: e-module-mem.edj Removed Files: module.desktop.in module.edj Log Message: Memory module converted to new desktop spec/icon. =================================================================== RCS file: /cvs/e/e_modules/mem/ABOUT-NLS,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ABOUT-NLS 9 Mar 2006 11:37:42 -0000 1.1 +++ ABOUT-NLS 30 Mar 2007 20:30:34 -0000 1.2 @@ -1,8 +1,8 @@ Notes on the Free Translation Project ************************************* - Free software is going international! The Free Translation Project -is a way to get maintainers of free software, translators, and users all +Free software is going international! The Free Translation Project is +a way to get maintainers of free software, translators, and users all together, so that will gradually become able to speak many languages. A few packages already provide translations for their messages. @@ -25,7 +25,7 @@ Quick configuration advice ========================== - If you want to exploit the full power of internationalization, you +If you want to exploit the full power of internationalization, you should configure it using ./configure --with-included-gettext @@ -48,10 +48,10 @@ INSTALL Matters =============== - Some packages are "localizable" when properly installed; the -programs they contain can be made to speak your own native language. -Most such packages use GNU `gettext'. Other packages have their own -ways to internationalization, predating GNU `gettext'. +Some packages are "localizable" when properly installed; the programs +they contain can be made to speak your own native language. Most such +packages use GNU `gettext'. Other packages have their own ways to +internationalization, predating GNU `gettext'. By default, this package will be installed to allow translation of messages. It will automatically detect whether the system already @@ -98,7 +98,7 @@ Using This Package ================== - As a user, if your language has been installed for this package, you +As a user, if your language has been installed for this package, you only have to set the `LANG' environment variable to the appropriate `LL_CC' combination. Here `LL' is an ISO 639 two-letter language code, and `CC' is an ISO 3166 two-letter country code. For example, let's @@ -131,6 +131,13 @@ read translations in German than English for when Swedish is not available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'. + Special advice for Norwegian users: The language code for Norwegian +bokma*l changed from `no' to `nb' recently (in 2003). During the +transition period, while some message catalogs for this language are +installed under `nb' and some older ones under `no', it's recommended +for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and +older translations are used. + In the `LANGUAGE' environment variable, but not in the `LANG' environment variable, `LL_CC' combinations can be abbreviated as `LL' to denote the language's main dialect. For example, `de' is equivalent @@ -140,7 +147,7 @@ Translating Teams ================= - For the Free Translation Project to be a success, we need interested +For the Free Translation Project to be a success, we need interested people who like their own language and write it well, and who are also able to synergize with other translators speaking the same language. Each translation team has its own mailing list. The up-to-date list of @@ -170,16 +177,559 @@ Available Packages ================== - Languages are not equally supported in all packages. The following -matrix shows the current state of internationalization, as of April -2005. The matrix shows, in regard of each package, for which languages +Languages are not equally supported in all packages. The following +matrix shows the current state of internationalization, as of January +2004. The matrix shows, in regard of each package, for which languages PO files have been submitted to translation coordination, with a translation percentage of at least 50%. - Ready PO files en fr ja de bg es fi pl pt ru - +-------------------------------+ - enlightenment | [] [] [] [] [] [] [] [] [] [] | - + Ready PO files af am ar az be bg bs ca cs da de el en en_GB eo es + +----------------------------------------------------+ + a2ps | [] [] [] [] | + aegis | () | + ant-phone | () | + anubis | | + ap-utils | | + aspell | [] | + bash | [] [] [] [] | + batchelor | | + bfd | [] [] | + binutils | [] [] | + bison | [] [] [] | + bluez-pin | [] [] [] | + clisp | | + clisp | [] [] [] | + console-tools | [] [] | + coreutils | [] [] [] [] | + cpio | [] [] [] | + darkstat | [] () [] | + diffutils | [] [] [] [] [] [] [] | + e2fsprogs | [] [] [] | + enscript | [] [] [] [] | + error | [] [] [] [] [] | + fetchmail | [] () [] [] [] [] | + fileutils | [] [] [] | + findutils | [] [] [] [] [] [] [] | + flex | [] [] [] [] | + fslint | | + gas | [] | + gawk | [] [] [] [] | + gbiff | [] | + gcal | [] | + gcc | [] [] | + gettext | [] [] [] [] [] | + gettext-examples | [] [] [] [] | + gettext-runtime | [] [] [] [] [] | + gettext-tools | [] [] [] | + gimp-print | [] [] [] [] [] | + gliv | | + glunarclock | [] [] | + gnubiff | [] | + gnucash | [] () [] [] | + gnucash-glossary | [] () [] | + gnupg | [] () [] [] [] [] | + gpe-aerial | [] | + gpe-beam | [] [] | + gpe-calendar | [] [] | + gpe-clock | [] [] | + gpe-conf | [] [] | + gpe-contacts | [] [] | + gpe-edit | [] | + gpe-go | [] | + gpe-login | [] [] | + gpe-ownerinfo | [] [] | + gpe-sketchbook | [] [] | + gpe-su | [] [] | + gpe-taskmanager | [] [] | + gpe-timesheet | [] | + gpe-today | [] [] | + gpe-todo | [] [] | + gphoto2 | [] [] [] [] | + gprof | [] [] [] | + gpsdrive | () () () | + gramadoir | [] | + grep | [] [] [] [] [] [] | + gretl | [] | + gtick | [] () | + hello | [] [] [] [] [] [] | + id-utils | [] [] | + indent | [] [] [] [] | + iso_3166 | [] [] [] [] [] [] [] [] [] [] | + iso_3166_1 | [] [] [] [] [] [] | + iso_3166_2 | | + iso_3166_3 | [] | + iso_4217 | [] [] [] [] | + iso_639 | | + jpilot | [] [] [] | + jtag | | + jwhois | [] | + kbd | [] [] [] [] [] | + latrine | () | + ld | [] [] | + libc | [] [] [] [] [] [] | + libgpewidget | [] [] | + libiconv | [] [] [] [] [] | + lifelines | [] () | + lilypond | [] | + lingoteach | | + lingoteach_lessons | () () | + lynx | [] [] [] [] | + m4 | [] [] [] [] | + mailutils | [] [] | + make | [] [] [] | + man-db | [] () [] [] () | + minicom | [] [] [] | + mysecretdiary | [] [] [] | + nano | [] () [] [] [] | + nano_1_0 | [] () [] [] [] | + opcodes | [] | + parted | [] [] [] [] [] | + ptx | [] [] [] [] [] | + python | | + radius | [] | + recode | [] [] [] [] [] [] [] | + rpm | [] [] | + screem | | + scrollkeeper | [] [] [] [] [] [] | + sed | [] [] [] [] [] [] | + sh-utils | [] [] [] | + shared-mime-info | | + sharutils | [] [] [] [] [] [] | + silky | () | + skencil | [] () [] | + sketch | [] () [] | + soundtracker | [] [] [] | + sp | [] | + tar | [] [] [] [] | + texinfo | [] [] [] | + textutils | [] [] [] [] | + tin | () () | + tp-robot | | + tuxpaint | [] [] [] [] [] [] [] | + unicode-han-tra... | | + unicode-transla... | | + util-linux | [] [] [] [] [] | + vorbis-tools | [] [] [] [] | + wastesedge | () | + wdiff | [] [] [] [] | + wget | [] [] [] [] [] [] | + xchat | [] [] [] [] | + xfree86_xkb_xml | [] [] | + xpad | [] | + +----------------------------------------------------+ + af am ar az be bg bs ca cs da de el en en_GB eo es + 4 0 0 1 9 4 1 40 41 60 78 17 1 5 13 68 + + et eu fa fi fr ga gl he hr hu id is it ja ko lg + +-------------------------------------------------+ + a2ps | [] [] [] () () | + aegis | | + ant-phone | [] | + anubis | [] | + ap-utils | [] | + aspell | [] [] | + bash | [] [] | + batchelor | [] [] | + bfd | [] | + binutils | [] [] | + bison | [] [] [] [] | + bluez-pin | [] [] [] [] [] | + clisp | | + clisp | [] | + console-tools | | + coreutils | [] [] [] [] [] [] | + cpio | [] [] [] [] | + darkstat | () [] [] [] | + diffutils | [] [] [] [] [] [] [] | + e2fsprogs | | + enscript | [] [] | + error | [] [] [] [] | + fetchmail | [] | + fileutils | [] [] [] [] [] [] | + findutils | [] [] [] [] [] [] [] [] [] [] [] | + flex | [] [] [] | + fslint | [] | + gas | [] | + gawk | [] [] [] | + gbiff | [] | + gcal | [] | + gcc | [] | + gettext | [] [] [] | + gettext-examples | [] [] | + gettext-runtime | [] [] [] [] [] | + gettext-tools | [] [] [] | + gimp-print | [] [] | + gliv | () | + glunarclock | [] [] [] [] | + gnubiff | [] | + gnucash | () [] | + gnucash-glossary | [] | + gnupg | [] [] [] [] [] [] [] | + gpe-aerial | [] | + gpe-beam | [] | + gpe-calendar | [] [] [] | + gpe-clock | [] | + gpe-conf | [] | + gpe-contacts | [] [] | + gpe-edit | [] [] | + gpe-go | [] | + gpe-login | [] [] | + gpe-ownerinfo | [] [] [] | + gpe-sketchbook | [] | + gpe-su | [] | + gpe-taskmanager | [] | + gpe-timesheet | [] [] [] | + gpe-today | [] [] | + gpe-todo | [] [] | + gphoto2 | [] [] [] | + gprof | [] [] | + gpsdrive | () () () | + gramadoir | [] [] | + grep | [] [] [] [] [] [] [] [] [] [] [] | + gretl | [] [] | + gtick | [] [] [] | + hello | [] [] [] [] [] [] [] [] [] [] [] [] [] | + id-utils | [] [] [] [] | + indent | [] [] [] [] [] [] [] [] [] | + iso_3166 | [] [] [] [] [] [] [] | + iso_3166_1 | [] [] [] [] [] | + iso_3166_2 | | + iso_3166_3 | | + iso_4217 | [] [] [] [] [] [] | + iso_639 | | + jpilot | [] () | + jtag | [] | + jwhois | [] [] [] [] | + kbd | [] | + latrine | [] | + ld | [] | + libc | [] [] [] [] [] [] | + libgpewidget | [] [] [] [] | + libiconv | [] [] [] [] [] [] [] [] [] | + lifelines | () | + lilypond | [] | + lingoteach | [] [] | + lingoteach_lessons | | + lynx | [] [] [] [] | + m4 | [] [] [] [] | + mailutils | | + make | [] [] [] [] [] [] | + man-db | () () | + minicom | [] [] [] [] | + mysecretdiary | [] [] | + nano | [] [] [] [] | + nano_1_0 | [] [] [] [] | + opcodes | [] | + parted | [] [] [] | + ptx | [] [] [] [] [] [] [] | + python | | + radius | [] | + recode | [] [] [] [] [] [] | + rpm | [] [] | + screem | | + scrollkeeper | [] | + sed | [] [] [] [] [] [] [] [] [] | + sh-utils | [] [] [] [] [] [] [] | + shared-mime-info | [] [] [] | + sharutils | [] [] [] [] [] | + silky | () [] () () | + skencil | [] | + sketch | [] | + soundtracker | [] [] | + sp | [] () | + tar | [] [] [] [] [] [] [] [] [] | + texinfo | [] [] [] [] | + textutils | [] [] [] [] [] [] | + tin | [] () | + tp-robot | [] | + tuxpaint | [] [] [] [] [] [] [] [] [] | + unicode-han-tra... | | + unicode-transla... | [] [] | + util-linux | [] [] [] [] () [] | + vorbis-tools | [] | + wastesedge | () | + wdiff | [] [] [] [] [] [] | + wget | [] [] [] [] [] [] [] | + xchat | [] [] [] | + xfree86_xkb_xml | [] [] | + xpad | [] [] | + +-------------------------------------------------+ + et eu fa fi fr ga gl he hr hu id is it ja ko lg + 22 2 1 26 106 28 24 8 10 41 33 1 26 33 12 0 + + lt lv mk mn ms mt nb nl nn no nso pl pt pt_BR ro ru + +-----------------------------------------------------+ + a2ps | [] [] () () [] [] [] | + aegis | () () () | + ant-phone | [] [] | + anubis | [] [] [] [] [] [] | + ap-utils | [] () [] | + aspell | [] | + bash | [] [] [] | + batchelor | [] | + bfd | [] | + binutils | [] | + bison | [] [] [] [] [] | + bluez-pin | [] [] [] | + clisp | | + clisp | [] | + console-tools | [] | + coreutils | [] [] | + cpio | [] [] [] [] [] | + darkstat | [] [] [] [] | + diffutils | [] [] [] [] [] [] | + e2fsprogs | [] | + enscript | [] [] [] [] | + error | [] [] [] | + fetchmail | [] [] () [] | + fileutils | [] [] [] | + findutils | [] [] [] [] [] | + flex | [] [] [] [] | + fslint | [] [] | + gas | | + gawk | [] [] [] | + gbiff | [] [] | + gcal | | + gcc | | + gettext | [] [] [] | + gettext-examples | [] [] [] | + gettext-runtime | [] [] [] [] | + gettext-tools | [] [] | + gimp-print | [] | + gliv | [] [] [] | + glunarclock | [] [] [] [] | + gnubiff | [] | + gnucash | [] [] () [] | + gnucash-glossary | [] [] | + gnupg | [] | + gpe-aerial | [] [] [] [] | + gpe-beam | [] [] [] [] | + gpe-calendar | [] [] [] [] | + gpe-clock | [] [] [] [] | + gpe-conf | [] [] [] [] | + gpe-contacts | [] [] [] [] | + gpe-edit | [] [] [] [] | + gpe-go | [] [] [] | + gpe-login | [] [] [] [] | + gpe-ownerinfo | [] [] [] [] | + gpe-sketchbook | [] [] [] [] | + gpe-su | [] [] [] [] | + gpe-taskmanager | [] [] [] [] | + gpe-timesheet | [] [] [] [] | + gpe-today | [] [] [] [] | + gpe-todo | [] [] [] [] | + gphoto2 | [] | + gprof | [] [] | + gpsdrive | () () [] | + gramadoir | () [] | + grep | [] [] [] [] [] | + gretl | | + gtick | [] [] [] | + hello | [] [] [] [] [] [] [] [] [] [] | + id-utils | [] [] [] [] | + indent | [] [] [] [] | + iso_3166 | [] [] [] | + iso_3166_1 | [] [] | + iso_3166_2 | | + iso_3166_3 | [] | + iso_4217 | [] [] [] [] [] [] [] [] | + iso_639 | [] | + jpilot | () () | + jtag | | + jwhois | [] [] [] [] () | + kbd | [] [] [] | + latrine | [] | + ld | | + libc | [] [] [] [] | + libgpewidget | [] [] [] | + libiconv | [] [] [] [] [] | + lifelines | | + lilypond | | + lingoteach | | + lingoteach_lessons | | + lynx | [] [] [] | + m4 | [] [] [] [] [] | + mailutils | [] [] [] | + make | [] [] [] [] | + man-db | [] | + minicom | [] [] [] [] | + mysecretdiary | [] [] [] | + nano | [] [] [] [] [] | + nano_1_0 | [] [] [] [] [] [] | + opcodes | [] [] | + parted | [] [] [] [] | + ptx | [] [] [] [] [] [] [] [] | + python | | + radius | [] [] | + recode | [] [] [] [] | + rpm | [] [] [] | + screem | | + scrollkeeper | [] [] [] [] [] | + sed | [] [] [] | + sh-utils | [] [] | + shared-mime-info | [] [] | + sharutils | [] [] | + silky | () | + skencil | [] [] | + sketch | [] [] | + soundtracker | | + sp | | + tar | [] [] [] [] [] [] | + texinfo | [] [] [] [] | + textutils | [] [] | + tin | | + tp-robot | [] | + tuxpaint | [] [] [] [] [] [] [] [] | + unicode-han-tra... | | + unicode-transla... | | + util-linux | [] [] [] | + vorbis-tools | [] [] [] | + wastesedge | | + wdiff | [] [] [] [] [] | + wget | [] [] [] | + xchat | [] [] [] | + xfree86_xkb_xml | [] [] | + xpad | [] [] | + +-----------------------------------------------------+ + lt lv mk mn ms mt nb nl nn no nso pl pt pt_BR ro ru + 1 2 0 3 12 0 10 69 6 7 1 40 26 36 76 63 + + sk sl sr sv ta th tr uk ven vi wa xh zh_CN zh_TW zu + +-----------------------------------------------------+ + a2ps | [] [] [] [] | 16 + aegis | | 0 + ant-phone | | 3 + anubis | [] [] | 9 + ap-utils | () | 3 + aspell | | 4 + bash | | 9 + batchelor | | 3 + bfd | [] [] | 6 + binutils | [] [] [] | 8 + bison | [] [] | 14 + bluez-pin | [] [] [] | 14 + clisp | | 0 + clisp | | 5 + console-tools | | 3 + coreutils | [] [] [] [] | 16 + cpio | [] [] | 14 + darkstat | [] [] [] () () | 12 + diffutils | [] [] [] | 23 + e2fsprogs | [] [] | 6 + enscript | [] [] | 12 + error | [] [] [] | 15 + fetchmail | [] [] | 11 + fileutils | [] [] [] [] [] | 17 + findutils | [] [] [] [] [] [] | 29 + flex | [] [] | 13 + fslint | | 3 + gas | [] | 3 + gawk | [] [] | 12 + gbiff | | 4 + gcal | [] [] | 4 + gcc | [] | 4 + gettext | [] [] [] [] [] | 16 + gettext-examples | [] [] [] [] [] | 14 + gettext-runtime | [] [] [] [] [] [] [] [] | 22 + gettext-tools | [] [] [] [] [] [] | 14 + gimp-print | [] [] | 10 + gliv | | 3 + glunarclock | [] [] [] | 13 + gnubiff | | 3 + gnucash | [] [] | 9 + gnucash-glossary | [] [] [] | 8 + gnupg | [] [] [] [] | 17 + gpe-aerial | [] | 7 + gpe-beam | [] | 8 + gpe-calendar | [] [] [] [] | 13 + gpe-clock | [] [] [] | 10 + gpe-conf | [] [] | 9 + gpe-contacts | [] [] [] | 11 + gpe-edit | [] [] [] [] [] | 12 + gpe-go | | 5 + gpe-login | [] [] [] [] [] | 13 + gpe-ownerinfo | [] [] [] [] | 13 + gpe-sketchbook | [] [] | 9 + gpe-su | [] [] [] | 10 + gpe-taskmanager | [] [] [] | 10 + gpe-timesheet | [] [] [] [] | 12 + gpe-today | [] [] [] [] [] | 13 + gpe-todo | [] [] [] [] | 12 + gphoto2 | [] [] [] | 11 + gprof | [] [] | 9 + gpsdrive | [] [] | 3 + gramadoir | [] | 5 + grep | [] [] [] [] | 26 + gretl | | 3 + gtick | | 7 + hello | [] [] [] [] [] | 34 + id-utils | [] [] | 12 + indent | [] [] [] [] | 21 + iso_3166 | [] [] [] [] [] [] [] | 27 + iso_3166_1 | [] [] [] | 16 + iso_3166_2 | | 0 + iso_3166_3 | | 2 + iso_4217 | [] [] [] [] [] [] | 24 + iso_639 | | 1 + jpilot | [] [] [] [] [] | 9 + jtag | [] | 2 + jwhois | () [] [] | 11 + kbd | [] [] | 11 + latrine | | 2 + ld | [] [] | 5 + libc | [] [] [] [] | 20 + libgpewidget | [] [] [] [] | 13 + libiconv | [] [] [] [] [] [] [] [] | 27 + lifelines | [] | 2 + lilypond | [] | 3 + lingoteach | | 2 + lingoteach_lessons | () | 0 + lynx | [] [] [] | 14 + m4 | [] [] | 15 + mailutils | | 5 + make | [] [] [] | 16 + man-db | [] | 5 + minicom | | 11 + mysecretdiary | [] [] | 10 + nano | [] [] [] [] | 17 + nano_1_0 | [] [] [] | 17 + opcodes | [] [] | 6 + parted | [] [] [] | 15 + ptx | [] [] | 22 + python | | 0 + radius | | 4 + recode | [] [] [] | 20 + rpm | [] [] | 9 + screem | [] [] | 2 + scrollkeeper | [] [] [] | 15 + sed | [] [] [] [] [] [] | 24 + sh-utils | [] [] | 14 + shared-mime-info | [] [] | 7 + sharutils | [] [] [] [] | 17 + silky | () | 3 + skencil | [] | 6 + sketch | [] | 6 + soundtracker | [] [] | 7 + sp | [] | 3 + tar | [] [] [] [] [] | 24 + texinfo | [] [] [] | 14 + textutils | [] [] [] [] | 16 + tin | | 1 + tp-robot | | 2 + tuxpaint | [] [] [] [] [] | 29 + unicode-han-tra... | | 0 + unicode-transla... | | 2 + util-linux | [] [] | 15 + vorbis-tools | | 8 + wastesedge | | 0 + wdiff | [] [] [] | 18 + wget | [] [] [] [] [] [] [] [] | 24 + xchat | [] [] [] [] [] | 15 + xfree86_xkb_xml | [] [] [] [] [] | 11 + xpad | | 5 + +-----------------------------------------------------+ + 63 teams sk sl sr sv ta th tr uk ven vi wa xh zh_CN zh_TW zu + 131 domains 47 19 28 83 0 0 59 13 1 1 11 0 22 22 0 1373 Some counters in the preceding matrix are higher than the number of visible blocks let us expect. This is because a few extra PO files are @@ -192,7 +742,7 @@ lag between the mere existence a PO file and its wide availability in a distribution. - If August 2002 seems to be old, you may fetch a more recent copy of + If January 2004 seems to be old, you may fetch a more recent copy of this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date matrix with full percentage details can be found at `http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'. @@ -200,7 +750,7 @@ Using `gettext' in new packages =============================== - If you are writing a freely available program and want to +If you are writing a freely available program and want to internationalize it you are welcome to use GNU `gettext' in your package. Of course you have to respect the GNU Library General Public License which covers the use of the GNU `gettext' library. This means @@ -209,7 +759,7 @@ library or use modified versions of `libintl'. Once the sources are changed appropriately and the setup can handle -to use of `gettext' the only thing missing are the translations. The +the use of `gettext' the only thing missing are the translations. The Free Translation Project is also available for packages which are not developed inside the GNU project. Therefore the information given above applies also for every other Free Software Project. Contact =================================================================== RCS file: /cvs/e/e_modules/mem/Makefile.am,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- Makefile.am 8 Nov 2006 15:36:05 -0000 1.19 +++ Makefile.am 30 Mar 2007 20:30:34 -0000 1.20 @@ -12,7 +12,7 @@ files_DATA = module_icon.png \ module.desktop \ - module.edj \ + e-module-mem.edj \ mem.edj EXTRA_DIST= e_modules-mem.spec \ =================================================================== RCS file: /cvs/e/e_modules/mem/autogen.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- autogen.sh 9 Mar 2006 11:37:42 -0000 1.2 +++ autogen.sh 30 Mar 2007 20:30:34 -0000 1.3 @@ -5,6 +5,7 @@ touch README +echo "Running autopoint..." ; autopoint -f || : echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS || exit 1 echo "Running autoheader..." ; autoheader || exit 1 echo "Running autoconf..." ; autoconf || exit 1 =================================================================== RCS file: /cvs/e/e_modules/mem/configure.in,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- configure.in 17 Sep 2006 14:55:36 -0000 1.14 +++ configure.in 30 Mar 2007 20:30:34 -0000 1.15 @@ -168,7 +168,6 @@ AC_OUTPUT([ Makefile e_modules-mem.spec -module.desktop po/Makefile ],[ ]) =================================================================== RCS file: /cvs/e/e_modules/mem/e_mod_main.c,v retrieving revision 1.42 retrieving revision 1.43 diff -u -3 -r1.42 -r1.43 --- e_mod_main.c 30 Dec 2006 23:33:59 -0000 1.42 +++ e_mod_main.c 30 Mar 2007 20:30:34 -0000 1.43 @@ -113,7 +113,7 @@ char buf[4096]; o = edje_object_add (evas); - snprintf (buf, sizeof (buf), "%s/module.edj", + snprintf (buf, sizeof (buf), "%s/e-module-mem.edj", e_module_dir_get (mem_config->module)); edje_object_file_set (o, buf, "icon"); return o; |
From: Enlightenment C. <no...@cv...> - 2007-03-30 20:31:26
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Added Files: module.desktop Log Message: and add the actual module.desktop |
From: Enlightenment C. <no...@cv...> - 2007-04-25 09:22:39
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: configure.in Log Message: Pretty standard patch set from Lutin for recent pkg-config changes in EFL... committing in bulk. =================================================================== RCS file: /cvs/e/e_modules/mem/configure.in,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- configure.in 30 Mar 2007 20:30:34 -0000 1.15 +++ configure.in 25 Apr 2007 09:22:07 -0000 1.16 @@ -122,22 +122,9 @@ #AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl) #AC_SUBST(dlopen_libs) -AC_ARG_WITH(edje-config, -[ --with-edje-config=EDJE_CONFIG use edje-config specified ], -[ - EDJE_CONFIG=$withval; - echo "using "$EDJE_CONFIG" for edje-config"; -/ -],[ - PROG="edje-config"; - AC_PATH_PROG(EDJE_CONFIG, $PROG, "", $PATH) -]) -edje_cflags=`$EDJE_CONFIG --cflags` -edje_libs=`$EDJE_CONFIG --libs` -AC_SUBST(edje_cflags) -AC_SUBST(edje_libs) +PKG_CHECK_MODULES(EDJE, [edje >= 0.5.0]) -edje_cc="`$EDJE_CONFIG --prefix`/bin/edje_cc" +edje_cc="$(pkg-config --variable=prefix edje)/bin/edje_cc" AC_ARG_WITH(edje-cc, [ --with-edje-cc=PATH specify a specific path to edje_cc], [ @@ -145,7 +132,7 @@ edje_cc=$v echo " Enlightenment edje_cc explicitly set to "$edje_cc; ],[ - edje_cc="`$EDJE_CONFIG --prefix`/bin/edje_cc" + edje_cc="$(pkg-config --variable=prefix edje)/bin/edje_cc" ]) AC_SUBST(edje_cc) |
From: Enlightenment C. <no...@cv...> - 2007-10-31 14:09:43
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: e-module-mem.edj e_mod_config.c e_mod_main.h Log Message: Update mem module for recent breakage. =================================================================== RCS file: /cvs/e/e_modules/mem/e-module-mem.edj,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsYFiTzW and /tmp/cvsqz3NfI differ =================================================================== RCS file: /cvs/e/e_modules/mem/e_mod_config.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- e_mod_config.c 16 Sep 2007 01:46:50 -0000 1.14 +++ e_mod_config.c 31 Oct 2007 14:09:38 -0000 1.15 @@ -37,7 +37,7 @@ v->basic.apply_cfdata = _basic_apply_data; v->basic.create_widgets = _basic_create_widgets; - snprintf (buf, sizeof (buf), "%s/module.edj", + snprintf (buf, sizeof (buf), "%s/e-module-mail.edj", e_module_dir_get (mem_config->module)); con = e_container_current_get (e_manager_current_get ()); cfd = e_config_dialog_new (con, D_ ("Mem Configuration"), "Mem", "_e_modules_mem_config_dialog", buf, 0, v, ci); =================================================================== RCS file: /cvs/e/e_modules/mem/e_mod_main.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- e_mod_main.h 16 Sep 2007 01:46:50 -0000 1.13 +++ e_mod_main.h 31 Oct 2007 14:09:38 -0000 1.14 @@ -30,7 +30,6 @@ 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_about(E_Module *m); void _mem_config_updated(Config_Item *ci); void _config_mem_module(Config_Item *ci); |
From: Enlightenment C. <no...@cv...> - 2007-10-31 15:31:03
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: e_mod_config.c Log Message: Fix mem icon. =================================================================== RCS file: /cvs/e/e_modules/mem/e_mod_config.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- e_mod_config.c 31 Oct 2007 14:09:38 -0000 1.15 +++ e_mod_config.c 31 Oct 2007 15:31:01 -0000 1.16 @@ -37,10 +37,11 @@ v->basic.apply_cfdata = _basic_apply_data; v->basic.create_widgets = _basic_create_widgets; - snprintf (buf, sizeof (buf), "%s/e-module-mail.edj", + snprintf (buf, sizeof (buf), "%s/e-module-mem.edj", e_module_dir_get (mem_config->module)); con = e_container_current_get (e_manager_current_get ()); - cfd = e_config_dialog_new (con, D_ ("Mem Configuration"), "Mem", "_e_modules_mem_config_dialog", buf, 0, v, ci); + cfd = e_config_dialog_new (con, D_ ("Mem Configuration"), "Mem", + "_e_modules_mem_config_dialog", buf, 0, v, ci); mem_config->config_dialog = cfd; } |
From: Enlightenment C. <no...@cv...> - 2007-11-25 05:37:39
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: e_mod_main.h e_mod_main.c Log Message: Fix for gadcon menu breakage. =================================================================== RCS file: /cvs/e/e_modules/mem/e_mod_main.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- e_mod_main.h 31 Oct 2007 14:09:38 -0000 1.14 +++ e_mod_main.h 25 Nov 2007 05:37:36 -0000 1.15 @@ -10,7 +10,6 @@ { E_Module *module; E_Config_Dialog *config_dialog; - E_Menu *menu; Evas_List *instances; Evas_List *items; }; =================================================================== RCS file: /cvs/e/e_modules/mem/e_mod_main.c,v retrieving revision 1.48 retrieving revision 1.49 diff -u -3 -r1.48 -r1.49 --- e_mod_main.c 12 Nov 2007 04:15:52 -0000 1.48 +++ e_mod_main.c 25 Nov 2007 05:37:36 -0000 1.49 @@ -36,7 +36,6 @@ static void _mem_cb_mouse_out (void *data, Evas * e, Evas_Object * obj, void *event_info); static void _mem_menu_cb_configure (void *data, E_Menu * m, E_Menu_Item * mi); -static void _mem_menu_cb_post (void *data, E_Menu * m); static Config_Item *_mem_config_item_get (const char *id); static Mem *_mem_new (Evas * evas); static void _mem_free (Mem * mem); @@ -137,8 +136,7 @@ ecore_timer_del (inst->check_timer); mem_config->instances = evas_list_remove (mem_config->instances, inst); _mem_free (inst->mem); - free (inst); - inst = NULL; + E_FREE(inst); } static void @@ -149,15 +147,13 @@ inst = data; ev = event_info; - if ((ev->button == 3) && (!mem_config->menu)) + if ((ev->button == 3) && (!inst->gcc->menu)) { E_Menu *mn; E_Menu_Item *mi; int x, y, w, h; mn = e_menu_new (); - e_menu_post_deactivate_callback_set (mn, _mem_menu_cb_post, inst); - mem_config->menu = mn; mi = e_menu_item_new (mn); e_menu_item_label_set (mi, D_ ("Configuration")); @@ -173,22 +169,13 @@ e_util_zone_current_get (e_manager_current_get ()), x + ev->output.x, y + ev->output.y, 1, 1, - E_MENU_POP_DIRECTION_DOWN, 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 -_mem_menu_cb_post (void *data, E_Menu * m) -{ - if (!mem_config->menu) - return; - e_object_del (E_OBJECT (mem_config->menu)); - mem_config->menu = NULL; -} - -static void _mem_menu_cb_configure (void *data, E_Menu * m, E_Menu_Item * mi) { Instance *inst; @@ -335,12 +322,6 @@ if (mem_config->config_dialog) e_object_del (E_OBJECT (mem_config->config_dialog)); - if (mem_config->menu) - { - e_menu_post_deactivate_callback_set (mem_config->menu, NULL, NULL); - e_object_del (E_OBJECT (mem_config->menu)); - mem_config->menu = NULL; - } while (mem_config->items) { Config_Item *ci; @@ -350,11 +331,9 @@ evas_list_remove_list (mem_config->items, mem_config->items); if (ci->id) evas_stringshare_del (ci->id); - free (ci); - ci = NULL; + E_FREE(ci); } - free (mem_config); - mem_config = NULL; + E_FREE(mem_config); E_CONFIG_DD_FREE (conf_item_edd); E_CONFIG_DD_FREE (conf_edd); return 1; @@ -390,8 +369,7 @@ _mem_free (Mem * m) { evas_object_del (m->mem_obj); - free (m); - m = NULL; + E_FREE(m); } static void |
From: Enlightenment C. <no...@cv...> - 2007-12-30 19:49:57
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mem Dir : e_modules/mem Modified Files: module.desktop Log Message: Fix up module.desktop descriptions for new box width. =================================================================== RCS file: /cvs/e/e_modules/mem/module.desktop,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- module.desktop 4 Nov 2007 15:37:34 -0000 1.3 +++ module.desktop 30 Dec 2007 19:49:24 -0000 1.4 @@ -2,5 +2,5 @@ Type=Link Name=Mem Icon=e-module-mem -Comment=<hilight>Mem Gadget</hilight><br>Used to monitor memory utilization. -Comment[it]=<hilight>Modulo Mem</hilight><br>Usato per il monitoraggio del<br>utilizzo della memoria. +Comment=<hilight>Mem Gadget</hilight><br><br>Used to monitor memory utilization. +Comment[it]=<hilight>Modulo Mem</hilight><br><br>Usato per il monitoraggio del utilizzo della memoria. |