From: <enl...@li...> - 2005-12-12 04:49:56
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : monitor Dir : e_modules/monitor Log Message: Directory /cvsroot/enlightenment/e_modules/monitor added to the repository |
From: <enl...@li...> - 2005-12-12 05:09:48
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : monitor Dir : e_modules/monitor Added Files: AUTHORS COPYING ChangeLog INSTALL Makefile.am Makefile.in NEWS README VeraMono.ttf autogen.sh bg.png config.h configure.in cpu.png e_mod_main.c e_mod_main.h eth_dev.png flow_chart.c flow_chart.h linux_2.6.c linux_2.6.h memory.png module_icon.png monitor.edc over.png over_res.png wireless.png Log Message: |
From: <enl...@li...> - 2005-12-12 13:48:31
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : monitor Dir : e_modules/monitor Added Files: .cvsignore Log Message: |
From: <enl...@li...> - 2005-12-12 14:22:56
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : monitor Dir : e_modules/monitor Modified Files: .cvsignore Log Message: Updated .cvsignore =================================================================== RCS file: /cvsroot/enlightenment/e_modules/monitor/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- .cvsignore 12 Dec 2005 13:48:24 -0000 1.1 +++ .cvsignore 12 Dec 2005 14:22:49 -0000 1.2 @@ -1,2 +1,19 @@ -config.h +Makefile Makefile.in +aclocal.m4 +autom4te.cache +config.guess +config.h +config.h.in +config.log +config.status +config.sub +configure +depcomp +install-sh +libtool +missing +ltmain.sh +stamp-h1 +*.lo +*.la |
From: <enl...@li...> - 2005-12-12 15:45:52
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : monitor Dir : e_modules/monitor Modified Files: .cvsignore Log Message: Updated .cvsignore =================================================================== RCS file: /cvsroot/enlightenment/e_modules/monitor/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- .cvsignore 12 Dec 2005 14:22:49 -0000 1.2 +++ .cvsignore 12 Dec 2005 15:45:45 -0000 1.3 @@ -1,3 +1,5 @@ +.deps +.libs Makefile Makefile.in aclocal.m4 @@ -17,3 +19,4 @@ stamp-h1 *.lo *.la +*.edj |
From: <enl...@li...> - 2005-12-12 15:58:15
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : monitor Dir : e_modules/monitor Removed Files: Makefile.in config.h Log Message: Thanks onefang :) |
From: <enl...@li...> - 2005-12-19 21:00:18
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : monitor Dir : e_modules/monitor Modified Files: Makefile.am e_mod_main.c e_mod_main.h Added Files: e_mod_config.c e_mod_config.h Log Message: Monitor Config Dialog :) =================================================================== RCS file: /cvsroot/enlightenment/e_modules/monitor/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makefile.am 12 Dec 2005 05:09:41 -0000 1.1 +++ Makefile.am 19 Dec 2005 21:00:08 -0000 1.2 @@ -23,18 +23,20 @@ # the module .so file INCLUDES = -I. \ - -I$(top_srcdir) \ - -I$(includedir) \ - @e_cflags@ + -I$(top_srcdir) \ + -I$(includedir) \ + @e_cflags@ pkgdir = $(datadir)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ - e_mod_main.h \ - flow_chart.c \ - flow_chart.h \ - linux_2.6.c \ - linux_2.6.h + e_mod_main.h \ + e_mod_config.c \ + e_mod_config.h \ + flow_chart.c \ + flow_chart.h \ + linux_2.6.c \ + linux_2.6.h module_la_LIBADD = @e_libs@ -lm module_la_LDFLAGS = -module -avoid-version =================================================================== RCS file: /cvsroot/enlightenment/e_modules/monitor/e_mod_main.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_main.c 12 Dec 2005 05:09:41 -0000 1.1 +++ e_mod_main.c 19 Dec 2005 21:00:08 -0000 1.2 @@ -8,86 +8,16 @@ static Monitor_Face *_monitor_face_new(E_Container *con); static void _monitor_face_free(Monitor_Face *face); -/* -static void _monitor_face_enable(Monitor_Face *face); -static void _monitor_face_disable(Monitor_Face *face); -*/ static void _monitor_face_menu_new(Monitor_Face *face); static void _monitor_face_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gadman_Change change); Config_Face * _monitor_face_config_init(Config_Face *conf); static int _monitor_face_config_cb_timer(void *data); -static void _monitor_mem_real_ignore_buffers_set_cb(void *data, E_Menu *m, - E_Menu_Item *mi); -static void _monitor_mem_real_ignore_cached_set_cb(void *data, E_Menu *m, - E_Menu_Item *mi); - -static void _monitor_mem_interval_cb_fast(void *data, E_Menu *m, - E_Menu_Item *mi); -static void _monitor_mem_interval_cb_medium(void *data, E_Menu *m, - E_Menu_Item *mi); -static void _monitor_mem_interval_cb_normal(void *data, E_Menu *m, - E_Menu_Item *mi); -static void _monitor_mem_interval_cb_slow(void *data, E_Menu *m, - E_Menu_Item *mi); -static void _monitor_mem_interval_cb_very_slow(void *data, E_Menu *m, - E_Menu_Item *mi); - -static void _monitor_cpu_interval_cb_fast(void *data, E_Menu *m, - E_Menu_Item *mi); -static void _monitor_cpu_interval_cb_medium(void *data, E_Menu *m, - E_Menu_Item *mi); -static void _monitor_cpu_interval_cb_normal(void *data, E_Menu *m, - E_Menu_Item *mi); -static void _monitor_cpu_interval_cb_slow(void *data, E_Menu *m, - E_Menu_Item *mi); -static void _monitor_cpu_interval_cb_very_slow(void *data, E_Menu *m, - E_Menu_Item *mi); - -static void _monitor_net_interval_cb_fast(void *data, E_Menu *m, - E_Menu_Item *mi); -static void _monitor_net_interval_cb_medium(void *data, E_Menu *m, - E_Menu_Item *mi); -static void _monitor_net_interval_cb_normal(void *data, E_Menu *m, - E_Menu_Item *mi); -static void _monitor_net_interval_cb_slow(void *data, E_Menu *m, - E_Menu_Item *mi); -static void _monitor_net_interval_cb_very_slow(void *data, E_Menu *m, - E_Menu_Item *mi); -static void _monitor_net_interface_cb(void *data, E_Menu *m, - E_Menu_Item *mi); - -static void _monitor_wlan_interval_cb_fast(void *data, E_Menu *m, - E_Menu_Item *mi); -static void _monitor_wlan_interval_cb_medium(void *data, E_Menu *m, - E_Menu_Item *mi); -static void _monitor_wlan_interval_cb_normal(void *data, E_Menu *m, - E_Menu_Item *mi); -static void _monitor_wlan_interval_cb_slow(void *data, E_Menu *m, - E_Menu_Item *mi); -static void _monitor_wlan_interval_cb_very_slow(void *data, E_Menu *m, - E_Menu_Item *mi); -static void _monitor_wlan_interface_cb(void *data, E_Menu *m, - E_Menu_Item *mi); - - static void _monitor_face_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info); -/* -static void _monitor_face_cb_menu_enabled(void *data, E_Menu *m, - E_Menu_Item *mi); -*/ static void _monitor_face_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi); -/* -static void _monitor_face_cb_mouse_in(void *data, Evas *e, Evas_Object *obj, - void *event_info); -static void _monitor_face_cb_mouse_out(void *data, Evas *e, Evas_Object *obj, - void *event_info); -static void _monitor_face_cb_mouse_move(void *data, Evas *e, Evas_Object *obj, - void *event_info); -*/ static void _monitor_cpu_text_update_callcack(Flow_Chart *chart, void *data); static void _monitor_mem_real_text_update_callback(Flow_Chart *chart, void *data); @@ -96,6 +26,8 @@ static void _monitor_net_out_text_update_callcack(Flow_Chart *chart, void *data); static void _monitor_wlan_link_text_update_callcack(Flow_Chart *chart, void *data); +static void _monitor_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi); + static int _monitor_count; static E_Config_DD *conf_edd; @@ -167,6 +99,27 @@ return 1; } +int +e_modapi_config(E_Module *module) +{ + Monitor *mon; + Evas_List *l; + + mon = module->data; + for (l = mon->faces; l; l = l->next) + { + Monitor_Face *f; + + f = l->data; + if (f->mon == mon) + { + _config_monitor_module(f->con, f); + break; + } + } + return 1; +} + static int _monitor_face_config_cb_timer(void *data) { @@ -252,6 +205,7 @@ face = _monitor_face_new(con); if (face) { + face->mon = monitor; monitor->faces = evas_list_append(monitor->faces, face); /* Config */ if (!cl) @@ -282,16 +236,13 @@ _monitor_face_menu_new(face); mi = e_menu_item_new(monitor->config_menu); - e_menu_item_label_set(mi, con->name); + e_menu_item_label_set(mi, _("Configuration")); + e_menu_item_callback_set(mi, _monitor_menu_cb_configure, face); + mi = e_menu_item_new(monitor->config_menu); + e_menu_item_label_set(mi, con->name); e_menu_item_submenu_set(mi, face->menu); - /* Setup */ - /* - if (!face->conf->enabled) - _monitor_face_disable(face); - */ - /* * Now that init is done, set up intervals, * interfaces, and memory monitor parameters @@ -661,16 +612,6 @@ if (face->monitor_object) evas_object_del(face->monitor_object); if (face->table_object) evas_object_del(face->table_object); - e_object_del(E_OBJECT(face->menu_wireless_interface)); - e_object_del(E_OBJECT(face->menu_wireless_interval)); - e_object_del(E_OBJECT(face->menu_wireless)); - e_object_del(E_OBJECT(face->menu_network_interface)); - e_object_del(E_OBJECT(face->menu_network_interval)); - e_object_del(E_OBJECT(face->menu_network)); - e_object_del(E_OBJECT(face->menu_memory_interval)); - e_object_del(E_OBJECT(face->menu_memory)); - e_object_del(E_OBJECT(face->menu_cpu_interval)); - e_object_del(E_OBJECT(face->menu_cpu)); e_object_del(E_OBJECT(face->menu)); if (face->conf->wlan_interface) evas_stringshare_del(face->conf->wlan_interface); @@ -679,301 +620,6 @@ free(face); _monitor_count--; } -/* -static void -_monitor_face_enable(Monitor_Face *face) -{ - face->conf->enabled = 1; - //evas_object_show(face->exit_event_object); - e_config_save_queue(); -} - -static void -_monitor_face_disable(Monitor_Face *face) -{ - face->conf->enabled = 0; - //evas_object_hide(face->reset_object); - e_config_save_queue(); -} -*/ -static void -_monitor_face_menu_new(Monitor_Face *face) -{ - E_Menu_Item *mi; - Ecore_List* interfaces = NULL; - int interface_count = 0; - char* interface_name = NULL; - - /* Setup Menus */ - face->menu = e_menu_new(); - face->menu_cpu = e_menu_new(); - face->menu_cpu_interval = e_menu_new(); - face->menu_memory = e_menu_new(); - face->menu_memory_interval = e_menu_new(); - face->menu_network = e_menu_new(); - face->menu_network_interval = e_menu_new(); - face->menu_network_interface = e_menu_new(); - face->menu_wireless = e_menu_new(); - face->menu_wireless_interval = e_menu_new(); - face->menu_wireless_interface = e_menu_new(); - - /* Main Menu Items */ - mi = e_menu_item_new(face->menu); - e_menu_item_label_set(mi, _("Edit Mode")); - e_menu_item_callback_set(mi, _monitor_face_cb_menu_edit, face); - - /* CPU Menu */ - mi = e_menu_item_new(face->menu); - e_menu_item_label_set(mi, _("CPU")); - e_menu_item_icon_edje_set(mi, PACKAGE_DATA_DIR"/monitor.edj","monitor/menu/cpu"); - e_menu_item_submenu_set(mi, face->menu_cpu); - - mi = e_menu_item_new(face->menu_cpu); - e_menu_item_label_set(mi, _("Set Interval")); - e_menu_item_submenu_set(mi, face->menu_cpu_interval); - - /* CPU Menu Items */ - mi = e_menu_item_new(face->menu_cpu_interval); - e_menu_item_label_set(mi, _("Check Fast (1 sec)")); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 1); - if (face->conf->cpu_interval == 1.0) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _monitor_cpu_interval_cb_fast, face); - - mi = e_menu_item_new(face->menu_cpu_interval); - e_menu_item_label_set(mi, _("Check Medium (5 sec)")); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 1); - if (face->conf->cpu_interval == 5.0) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _monitor_cpu_interval_cb_medium, face); - - mi = e_menu_item_new(face->menu_cpu_interval); - e_menu_item_label_set(mi, _("Check Normal (10 sec)")); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 1); - if (face->conf->cpu_interval == 10.0) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _monitor_cpu_interval_cb_normal, face); - - mi = e_menu_item_new(face->menu_cpu_interval); - e_menu_item_label_set(mi, _("Check Slow (30 sec)")); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 1); - if (face->conf->cpu_interval == 30.0) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _monitor_cpu_interval_cb_slow, face); - - mi = e_menu_item_new(face->menu_cpu_interval); - e_menu_item_label_set(mi, _("Check Very Slow (60 sec)")); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 1); - if (face->conf->cpu_interval == 60.0) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _monitor_cpu_interval_cb_very_slow, face); - - /* Memory Menu */ - mi = e_menu_item_new(face->menu); - e_menu_item_label_set(mi, _("Memory")); - e_menu_item_icon_edje_set(mi, PACKAGE_DATA_DIR"/monitor.edj","monitor/menu/mem"); - e_menu_item_submenu_set(mi, face->menu_memory); - - mi = e_menu_item_new(face->menu_memory); - e_menu_item_label_set(mi, _("Set Interval")); - e_menu_item_submenu_set(mi, face->menu_memory_interval); - - /* Memory Interval Menu Items */ - mi = e_menu_item_new(face->menu_memory_interval); - e_menu_item_label_set(mi, _("Check Fast (1 sec)")); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 1); - if (face->conf->mem_interval == 1.0) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _monitor_mem_interval_cb_fast, face); - - mi = e_menu_item_new(face->menu_memory_interval); - e_menu_item_label_set(mi, _("Check Medium (5 sec)")); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 1); - if (face->conf->mem_interval == 5.0) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _monitor_mem_interval_cb_medium, face); - - mi = e_menu_item_new(face->menu_memory_interval); - e_menu_item_label_set(mi, _("Check Normal (10 sec)")); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 1); - if (face->conf->mem_interval == 10.0) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _monitor_mem_interval_cb_normal, face); - - mi = e_menu_item_new(face->menu_memory_interval); - e_menu_item_label_set(mi, _("Check Slow (30 sec)")); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 1); - if (face->conf->mem_interval == 30.0) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _monitor_mem_interval_cb_slow, face); - - mi = e_menu_item_new(face->menu_memory_interval); - e_menu_item_label_set(mi, _("Check Very Slow (60 sec)")); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 1); - if (face->conf->mem_interval == 60.0) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _monitor_mem_interval_cb_very_slow, face); - - /* Memory Menu Items */ - mi = e_menu_item_new(face->menu_memory); - e_menu_item_label_set(mi, _("Ignore Cached")); - e_menu_item_check_set(mi, 1); - if (face->conf->mem_real_ignore_cached) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _monitor_mem_real_ignore_cached_set_cb, face); - - mi = e_menu_item_new(face->menu_memory); - e_menu_item_label_set(mi, _("Ignore Buffers")); - e_menu_item_check_set(mi, 1); - if (face->conf->mem_real_ignore_buffers) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _monitor_mem_real_ignore_buffers_set_cb, face); - - /* Wireless Menu */ - mi = e_menu_item_new(face->menu); - e_menu_item_label_set(mi, _("Wireless")); - e_menu_item_icon_edje_set(mi, PACKAGE_DATA_DIR"/monitor.edj","monitor/menu/wlan"); - e_menu_item_submenu_set(mi, face->menu_wireless); - - mi = e_menu_item_new(face->menu_wireless); - e_menu_item_label_set(mi, _("Set Interval")); - e_menu_item_submenu_set(mi, face->menu_wireless_interval); - - mi = e_menu_item_new(face->menu_wireless); - e_menu_item_label_set(mi, _("Select Interface")); - e_menu_item_submenu_set(mi, face->menu_wireless_interface); - - interfaces = ecore_list_new (); - interface_count = wlan_interfaces_get (interfaces); - - ecore_list_goto_first(interfaces); - - while ((interface_name = ecore_list_current(interfaces))) - { - - mi = e_menu_item_new(face->menu_wireless_interface); - e_menu_item_label_set(mi, _(interface_name)); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 1); - if (face->conf->wlan_interface) - if (!strcmp(face->conf->wlan_interface, interface_name)) - e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _monitor_wlan_interface_cb, face); - - free(interface_name); - ecore_list_remove(interfaces); - } - - ecore_list_destroy(interfaces); - - /* Wireless Menu Items */ - mi = e_menu_item_new(face->menu_wireless_interval); - e_menu_item_label_set(mi, _("Check Fast (1 sec)")); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 1); - if (face->conf->wlan_interval == 1.0) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _monitor_wlan_interval_cb_fast, face); - - mi = e_menu_item_new(face->menu_wireless_interval); - e_menu_item_label_set(mi, _("Check Medium (5 sec)")); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 1); - if (face->conf->wlan_interval == 5.0) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _monitor_wlan_interval_cb_medium, face); - - mi = e_menu_item_new(face->menu_wireless_interval); - e_menu_item_label_set(mi, _("Check Normal (10 sec)")); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 1); - if (face->conf->wlan_interval == 10.0) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _monitor_wlan_interval_cb_normal, face); - - mi = e_menu_item_new(face->menu_wireless_interval); - e_menu_item_label_set(mi, _("Check Slow (30 sec)")); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 1); - if (face->conf->wlan_interval == 30.0) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _monitor_wlan_interval_cb_slow, face); - - mi = e_menu_item_new(face->menu_wireless_interval); - e_menu_item_label_set(mi, _("Check Very Slow (60 sec)")); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 1); - if (face->conf->wlan_interval == 60.0) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _monitor_wlan_interval_cb_very_slow, face); - - /* Network Menu */ - mi = e_menu_item_new(face->menu); - e_menu_item_label_set(mi, _("Network")); - e_menu_item_icon_edje_set(mi, PACKAGE_DATA_DIR"/monitor.edj","monitor/menu/net"); - e_menu_item_submenu_set(mi, face->menu_network); - - mi = e_menu_item_new(face->menu_network); - e_menu_item_label_set(mi, _("Set Interval")); - e_menu_item_submenu_set(mi, face->menu_network_interval); - - mi = e_menu_item_new(face->menu_network); - e_menu_item_label_set(mi, _("Select Interface")); - e_menu_item_submenu_set(mi, face->menu_network_interface); - - interfaces = ecore_list_new (); - interface_count = net_interfaces_get (interfaces); - - ecore_list_goto_first(interfaces); - - while ((interface_name = ecore_list_current(interfaces))) - { - - mi = e_menu_item_new(face->menu_network_interface); - e_menu_item_label_set(mi, _(interface_name)); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 1); - if (face->conf->net_interface) - if (!strcmp(face->conf->net_interface, interface_name)) - e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _monitor_net_interface_cb, face); - - free(interface_name); - ecore_list_remove(interfaces); - } - - ecore_list_destroy(interfaces); - - /* Network Menu Items */ - mi = e_menu_item_new(face->menu_network_interval); - e_menu_item_label_set(mi, _("Check Fast (1 sec)")); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 1); - if (face->conf->net_interval == 1.0) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _monitor_net_interval_cb_fast, face); - - mi = e_menu_item_new(face->menu_network_interval); - e_menu_item_label_set(mi, _("Check Medium (5 sec)")); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 1); - if (face->conf->net_interval == 5.0) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _monitor_net_interval_cb_medium, face); - - mi = e_menu_item_new(face->menu_network_interval); - e_menu_item_label_set(mi, _("Check Normal (10 sec)")); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 1); - if (face->conf->net_interval == 10.0) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _monitor_net_interval_cb_normal, face); - - mi = e_menu_item_new(face->menu_network_interval); - e_menu_item_label_set(mi, _("Check Slow (30 sec)")); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 1); - if (face->conf->net_interval == 30.0) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _monitor_net_interval_cb_slow, face); - - mi = e_menu_item_new(face->menu_network_interval); - e_menu_item_label_set(mi, _("Check Very Slow (60 sec)")); - e_menu_item_radio_set(mi, 1); - e_menu_item_radio_group_set(mi, 1); - if (face->conf->net_interval == 60.0) e_menu_item_toggle_set(mi, 1); - e_menu_item_callback_set(mi, _monitor_net_interval_cb_very_slow, face); - -} static void _monitor_face_cb_gmc_change(void *data, E_Gadman_Client *gmc, @@ -1030,25 +676,7 @@ break; } } -/* -static void -_monitor_face_cb_menu_enabled(void *data, E_Menu *m, E_Menu_Item *mi) -{ - Monitor_Face *face; - unsigned char enabled; - face = data; - enabled = e_menu_item_toggle_get(mi); - if ((face->conf->enabled) && (!enabled)) - { - _monitor_face_disable(face); - } - else if ((!face->conf->enabled) && (enabled)) - { - _monitor_face_enable(face); - } -} -*/ static void _monitor_face_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi) { @@ -1059,59 +687,6 @@ } static void -_monitor_mem_real_ignore_buffers_set_cb(void *data, E_Menu *m, - E_Menu_Item *mi) -{ - Monitor_Face *face; - - face = data; - unsigned char enabled; - - enabled = e_menu_item_toggle_get(mi); - - if (!enabled) { - /* Uncheck */ - face->conf->mem_real_ignore_buffers = 0; - mem_real_ignore_buffers_set(face->conf->mem_real_ignore_buffers); - e_menu_item_toggle_set(mi, face->conf->mem_real_ignore_buffers); - } - else - { - /* Check */ - face->conf->mem_real_ignore_buffers = 1; - mem_real_ignore_buffers_set(face->conf->mem_real_ignore_buffers); - e_menu_item_toggle_set(mi, face->conf->mem_real_ignore_buffers); - } - e_config_save_queue(); -} -static void -_monitor_mem_real_ignore_cached_set_cb(void *data, E_Menu *m, - E_Menu_Item *mi) -{ - Monitor_Face *face; - - face = data; - unsigned char enabled; - - enabled = e_menu_item_toggle_get(mi); - - if (!enabled) { - /* Uncheck */ - face->conf->mem_real_ignore_cached = 0; - mem_real_ignore_cached_set(face->conf->mem_real_ignore_cached); - e_menu_item_toggle_set(mi, face->conf->mem_real_ignore_cached); - } - else - { - /* Check */ - face->conf->mem_real_ignore_cached = 1; - mem_real_ignore_cached_set(face->conf->mem_real_ignore_cached); - e_menu_item_toggle_set(mi, face->conf->mem_real_ignore_cached); - } - e_config_save_queue(); -} - -static void _monitor_face_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info) { @@ -1153,277 +728,51 @@ { } */ -static void -_monitor_mem_interval_cb_fast(void *data, E_Menu *m, - E_Menu_Item *mi) -{ - Monitor_Face *face; - face = data; - - face->conf->mem_interval = 1.0; - flow_chart_update_rate_set(flow_chart_mem_real, face->conf->mem_interval); - flow_chart_update_rate_set(flow_chart_mem_swap, face->conf->mem_interval); - e_config_save_queue(); -} - -static void -_monitor_mem_interval_cb_medium(void *data, E_Menu *m, - E_Menu_Item *mi) -{ - Monitor_Face *face; - face = data; - - face->conf->mem_interval = 5.0; - flow_chart_update_rate_set(flow_chart_mem_real, face->conf->mem_interval); - flow_chart_update_rate_set(flow_chart_mem_swap, face->conf->mem_interval); - e_config_save_queue(); -} static void -_monitor_mem_interval_cb_normal(void *data, E_Menu *m, - E_Menu_Item *mi) -{ - Monitor_Face *face; - face = data; - - face->conf->mem_interval = 10.0; - flow_chart_update_rate_set(flow_chart_mem_real, face->conf->mem_interval); - flow_chart_update_rate_set(flow_chart_mem_swap, face->conf->mem_interval); - e_config_save_queue(); -} - -static void -_monitor_mem_interval_cb_slow(void *data, E_Menu *m, - E_Menu_Item *mi) +_monitor_face_menu_new(Monitor_Face *face) { - Monitor_Face *face; - face = data; - - face->conf->mem_interval = 30.0; - flow_chart_update_rate_set(flow_chart_mem_real, face->conf->mem_interval); - flow_chart_update_rate_set(flow_chart_mem_swap, face->conf->mem_interval); - e_config_save_queue(); + E_Menu *mn; + E_Menu_Item *mi; + + mn = e_menu_new(); + face->menu = mn; + + mi = e_menu_item_new(mn); + e_menu_item_label_set(mi, _("Configuration")); + e_menu_item_callback_set(mi, _monitor_menu_cb_configure, face); + + mi = e_menu_item_new(face->menu); + e_menu_item_label_set(mi, _("Edit Mode")); + e_menu_item_callback_set(mi, _monitor_face_cb_menu_edit, face); } -static void -_monitor_mem_interval_cb_very_slow(void *data, E_Menu *m, - E_Menu_Item *mi) +void _monitor_cb_config_updated(void *data) { - Monitor_Face *face; - face = data; + Monitor_Face *face; + + face = data; + flow_chart_update_rate_set(flow_chart_cpu, face->conf->cpu_interval); - face->conf->mem_interval = 60.0; + mem_real_ignore_cached_set(face->conf->mem_real_ignore_cached); + mem_real_ignore_buffers_set(face->conf->mem_real_ignore_buffers); flow_chart_update_rate_set(flow_chart_mem_real, face->conf->mem_interval); flow_chart_update_rate_set(flow_chart_mem_swap, face->conf->mem_interval); - e_config_save_queue(); -} - -static void -_monitor_cpu_interval_cb_fast(void *data, E_Menu *m, - E_Menu_Item *mi) -{ - Monitor_Face *face; - face = data; - face->conf->cpu_interval = 1.0; - flow_chart_update_rate_set(flow_chart_cpu, face->conf->cpu_interval); - e_config_save_queue(); -} - -static void -_monitor_cpu_interval_cb_medium(void *data, E_Menu *m, - E_Menu_Item *mi) -{ - Monitor_Face *face; - face = data; - - face->conf->cpu_interval = 5.0; - flow_chart_update_rate_set(flow_chart_cpu, face->conf->cpu_interval); - e_config_save_queue(); -} - -static void -_monitor_cpu_interval_cb_normal(void *data, E_Menu *m, - E_Menu_Item *mi) -{ - Monitor_Face *face; - face = data; - - face->conf->cpu_interval = 10.0; - flow_chart_update_rate_set(flow_chart_cpu, face->conf->cpu_interval); - e_config_save_queue(); -} - -static void -_monitor_cpu_interval_cb_slow(void *data, E_Menu *m, - E_Menu_Item *mi) -{ - Monitor_Face *face; - face = data; - - face->conf->cpu_interval = 30.0; - flow_chart_update_rate_set(flow_chart_cpu, face->conf->cpu_interval); - e_config_save_queue(); -} - -static void -_monitor_cpu_interval_cb_very_slow(void *data, E_Menu *m, - E_Menu_Item *mi) -{ - Monitor_Face *face; - face = data; - - face->conf->cpu_interval = 60.0; - flow_chart_update_rate_set(flow_chart_cpu, face->conf->cpu_interval); - e_config_save_queue(); -} - -static void -_monitor_net_interval_cb_fast(void *data, E_Menu *m, - E_Menu_Item *mi) -{ - Monitor_Face *face; - face = data; - - face->conf->net_interval = 1.0; - flow_chart_update_rate_set(flow_chart_net_in, face->conf->net_interval); - flow_chart_update_rate_set(flow_chart_net_out, face->conf->net_interval); - e_config_save_queue(); -} - -static void -_monitor_net_interval_cb_medium(void *data, E_Menu *m, - E_Menu_Item *mi) -{ - Monitor_Face *face; - face = data; - - face->conf->net_interval = 5.0; - flow_chart_update_rate_set(flow_chart_net_in, face->conf->net_interval); - flow_chart_update_rate_set(flow_chart_net_out, face->conf->net_interval); - e_config_save_queue(); -} - -static void -_monitor_net_interval_cb_normal(void *data, E_Menu *m, - E_Menu_Item *mi) -{ - Monitor_Face *face; - face = data; - - face->conf->net_interval = 10.0; - flow_chart_update_rate_set(flow_chart_net_in, face->conf->net_interval); - flow_chart_update_rate_set(flow_chart_net_out, face->conf->net_interval); - e_config_save_queue(); -} - -static void -_monitor_net_interval_cb_slow(void *data, E_Menu *m, - E_Menu_Item *mi) -{ - Monitor_Face *face; - face = data; - - face->conf->net_interval = 30.0; - flow_chart_update_rate_set(flow_chart_net_in, face->conf->net_interval); - flow_chart_update_rate_set(flow_chart_net_out, face->conf->net_interval); - e_config_save_queue(); -} - -static void -_monitor_net_interval_cb_very_slow(void *data, E_Menu *m, - E_Menu_Item *mi) -{ - Monitor_Face *face; - face = data; - - face->conf->net_interval = 60.0; - flow_chart_update_rate_set(flow_chart_net_in, face->conf->net_interval); - flow_chart_update_rate_set(flow_chart_net_out, face->conf->net_interval); - e_config_save_queue(); -} - -static void -_monitor_net_interface_cb(void *data, E_Menu *m, - E_Menu_Item *mi) -{ - Monitor_Face *face; - face = data; - - face->conf->net_interface = (char *)evas_stringshare_add(mi->label); - net_interface_set(face->conf->net_interface); - e_config_save_queue(); -} - -static void -_monitor_wlan_interval_cb_fast(void *data, E_Menu *m, - E_Menu_Item *mi) -{ - Monitor_Face *face; - face = data; - - face->conf->wlan_interval = 1.0; - flow_chart_update_rate_set(flow_chart_wlan_link, face->conf->wlan_interval); - e_config_save_queue(); -} - -static void -_monitor_wlan_interval_cb_medium(void *data, E_Menu *m, - E_Menu_Item *mi) -{ - Monitor_Face *face; - face = data; - - face->conf->wlan_interval = 5.0; - flow_chart_update_rate_set(flow_chart_wlan_link, face->conf->wlan_interval); - e_config_save_queue(); -} - -static void -_monitor_wlan_interval_cb_normal(void *data, E_Menu *m, - E_Menu_Item *mi) -{ - Monitor_Face *face; - face = data; - - face->conf->wlan_interval = 10.0; - flow_chart_update_rate_set(flow_chart_wlan_link, face->conf->wlan_interval); - e_config_save_queue(); -} - -static void -_monitor_wlan_interval_cb_slow(void *data, E_Menu *m, - E_Menu_Item *mi) -{ - Monitor_Face *face; - face = data; - - face->conf->wlan_interval = 30.0; + wlan_interface_set(face->conf->wlan_interface); flow_chart_update_rate_set(flow_chart_wlan_link, face->conf->wlan_interval); - e_config_save_queue(); -} -static void -_monitor_wlan_interval_cb_very_slow(void *data, E_Menu *m, - E_Menu_Item *mi) -{ - Monitor_Face *face; - face = data; - - face->conf->wlan_interval = 60.0; - flow_chart_update_rate_set(flow_chart_wlan_link, face->conf->wlan_interval); - e_config_save_queue(); + net_interface_set(face->conf->net_interface); + flow_chart_update_rate_set(flow_chart_net_in, face->conf->net_interval); + flow_chart_update_rate_set(flow_chart_net_out, face->conf->net_interval); } -static void -_monitor_wlan_interface_cb(void *data, E_Menu *m, - E_Menu_Item *mi) +static void +_monitor_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi) { - Monitor_Face *face; - face = data; - - face->conf->wlan_interface = (char *)evas_stringshare_add(mi->label); - wlan_interface_set(face->conf->wlan_interface); - e_config_save_queue(); + Monitor_Face *f; + + f = data; + if (!f) return; + _config_monitor_module(f->con, f); } - =================================================================== RCS file: /cvsroot/enlightenment/e_modules/monitor/e_mod_main.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_main.h 12 Dec 2005 05:09:41 -0000 1.1 +++ e_mod_main.h 19 Dec 2005 21:00:08 -0000 1.2 @@ -47,18 +47,9 @@ struct _Monitor_Face { + Monitor *mon; E_Container *con; E_Menu *menu; - E_Menu *menu_cpu; - E_Menu *menu_cpu_interval; - E_Menu *menu_memory; - E_Menu *menu_memory_interval; - E_Menu *menu_network; - E_Menu *menu_network_interval; - E_Menu *menu_network_interface; - E_Menu *menu_wireless; - E_Menu *menu_wireless_interval; - E_Menu *menu_wireless_interface; Config_Face *conf; Evas_Object *cpu, *net, *mem, *wlan; @@ -78,4 +69,5 @@ EAPI int e_modapi_info (E_Module *m); EAPI int e_modapi_about (E_Module *m); +EAPI void _monitor_cb_config_updated(void *data); #endif |
From: <enl...@li...> - 2005-12-20 03:42:53
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : monitor Dir : e_modules/monitor Modified Files: e_mod_main.c Log Message: Formatting =================================================================== RCS file: /cvsroot/enlightenment/e_modules/monitor/e_mod_main.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_mod_main.c 19 Dec 2005 21:00:08 -0000 1.2 +++ e_mod_main.c 20 Dec 2005 03:42:47 -0000 1.3 @@ -14,18 +14,14 @@ Config_Face * _monitor_face_config_init(Config_Face *conf); static int _monitor_face_config_cb_timer(void *data); -static void _monitor_face_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, - void *event_info); -static void _monitor_face_cb_menu_edit(void *data, E_Menu *m, - E_Menu_Item *mi); - +static void _monitor_face_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info); +static void _monitor_face_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi); static void _monitor_cpu_text_update_callcack(Flow_Chart *chart, void *data); static void _monitor_mem_real_text_update_callback(Flow_Chart *chart, void *data); static void _monitor_mem_swap_text_update_callback(Flow_Chart *chart, void *data); static void _monitor_net_in_text_update_callcack(Flow_Chart *chart, void *data); static void _monitor_net_out_text_update_callcack(Flow_Chart *chart, void *data); static void _monitor_wlan_link_text_update_callcack(Flow_Chart *chart, void *data); - static void _monitor_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi); static int _monitor_count; @@ -94,8 +90,7 @@ e_modapi_about(E_Module *module) { e_module_dialog_show(_("Enlightenment Monitor Module"), - _("A simple module to give E17 a usage monitor " - "for some resources.")); + _("A simple module to give E17 a usage monitor for some resources.")); return 1; } @@ -123,8 +118,7 @@ static int _monitor_face_config_cb_timer(void *data) { - e_error_dialog_show(_("Configuration Upgraded"), - data); + e_error_dialog_show(_("Configuration Upgraded"), data); return 0; } @@ -212,9 +206,7 @@ { face->conf = E_NEW(Config_Face, 1); face->conf = _monitor_face_config_init(face->conf); - - monitor->conf->faces = - evas_list_append(monitor->conf->faces, face->conf); + monitor->conf->faces = evas_list_append(monitor->conf->faces, face->conf); } else { @@ -248,30 +240,17 @@ * interfaces, and memory monitor parameters * according to the configuration. */ - mem_real_ignore_buffers_set( - face->conf->mem_real_ignore_buffers); - mem_real_ignore_cached_set( - face->conf->mem_real_ignore_cached); - - net_interface_set( - face->conf->net_interface); - - wlan_interface_set( - face->conf->wlan_interface); - - flow_chart_update_rate_set(flow_chart_cpu, - face->conf->cpu_interval); - flow_chart_update_rate_set(flow_chart_mem_real, - face->conf->mem_interval); - flow_chart_update_rate_set(flow_chart_mem_swap, - face->conf->mem_interval); - flow_chart_update_rate_set(flow_chart_net_in, - face->conf->net_interval); - flow_chart_update_rate_set(flow_chart_net_out, - face->conf->net_interval); - flow_chart_update_rate_set(flow_chart_wlan_link, - face->conf->wlan_interval); - + mem_real_ignore_buffers_set(face->conf->mem_real_ignore_buffers); + mem_real_ignore_cached_set(face->conf->mem_real_ignore_cached); + net_interface_set(face->conf->net_interface); + wlan_interface_set(face->conf->wlan_interface); + + flow_chart_update_rate_set(flow_chart_cpu, face->conf->cpu_interval); + flow_chart_update_rate_set(flow_chart_mem_real, face->conf->mem_interval); + flow_chart_update_rate_set(flow_chart_mem_swap, face->conf->mem_interval); + flow_chart_update_rate_set(flow_chart_net_in, face->conf->net_interval); + flow_chart_update_rate_set(flow_chart_net_out, face->conf->net_interval); + flow_chart_update_rate_set(flow_chart_wlan_link, face->conf->wlan_interval); } } } @@ -341,7 +320,6 @@ edje_object_part_swallow(face->monitor_object, "items", face->table_object); evas_object_show(o); - /* setup cpu */ o = edje_object_add(con->bg_evas); face->cpu = o; @@ -363,8 +341,7 @@ o = evas_object_rectangle_add(con->bg_evas); face->cpu_ev_obj = o; evas_object_color_set(o, 255,255,255,0); - evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, - _monitor_face_cb_mouse_down, face); + evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _monitor_face_cb_mouse_down, face); evas_object_show(o); /* setup mem */ @@ -383,8 +360,7 @@ flow_chart_update_rate_set(flow_chart_mem_real, tmp_mem_interval); chart_container_chart_add(chart_con, flow_chart_mem_real); face->chart_mem = chart_con; - flow_chart_callback_set(flow_chart_mem_real, - _monitor_mem_real_text_update_callback, face); + flow_chart_callback_set(flow_chart_mem_real, _monitor_mem_real_text_update_callback, face); flow_chart_mem_swap = flow_chart_new(); flow_chart_color_set(flow_chart_mem_swap, 51, 181, 69, 255); @@ -392,15 +368,12 @@ flow_chart_update_rate_set(flow_chart_mem_swap, tmp_mem_interval); flow_chart_alignment_set(flow_chart_mem_swap, 0); chart_container_chart_add(chart_con, flow_chart_mem_swap); - flow_chart_callback_set(flow_chart_mem_swap, - _monitor_mem_swap_text_update_callback, face); - + flow_chart_callback_set(flow_chart_mem_swap, _monitor_mem_swap_text_update_callback, face); o = evas_object_rectangle_add(con->bg_evas); face->mem_ev_obj = o; evas_object_color_set(o, 255,255,255,0); - evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, - _monitor_face_cb_mouse_down, face); + evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _monitor_face_cb_mouse_down, face); evas_object_show(o); /* setup net */ @@ -419,8 +392,7 @@ flow_chart_update_rate_set(flow_chart_net_in, tmp_net_interval); chart_container_chart_add(chart_con, flow_chart_net_in); face->chart_net = chart_con; - flow_chart_callback_set(flow_chart_net_in, - _monitor_net_in_text_update_callcack, face); + flow_chart_callback_set(flow_chart_net_in, _monitor_net_in_text_update_callcack, face); flow_chart_net_out = flow_chart_new(); flow_chart_color_set(flow_chart_net_out, 51, 181, 69, 255); @@ -428,15 +400,12 @@ flow_chart_update_rate_set(flow_chart_net_out, tmp_net_interval); flow_chart_alignment_set(flow_chart_net_out, 0); chart_container_chart_add(chart_con, flow_chart_net_out); - flow_chart_callback_set(flow_chart_net_out, - _monitor_net_out_text_update_callcack, face); - + flow_chart_callback_set(flow_chart_net_out, _monitor_net_out_text_update_callcack, face); o = evas_object_rectangle_add(con->bg_evas); face->net_ev_obj = o; evas_object_color_set(o, 255,255,255,0); - evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, - _monitor_face_cb_mouse_down, face); + evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _monitor_face_cb_mouse_down, face); evas_object_show(o); /* setup wlan */ @@ -455,14 +424,12 @@ flow_chart_update_rate_set(flow_chart_wlan_link, tmp_wlan_interval); chart_container_chart_add(chart_con, flow_chart_wlan_link); face->chart_wlan = chart_con; - flow_chart_callback_set(flow_chart_wlan_link, - _monitor_wlan_link_text_update_callcack, face); + flow_chart_callback_set(flow_chart_wlan_link, _monitor_wlan_link_text_update_callcack, face); o = evas_object_rectangle_add(con->bg_evas); face->wlan_ev_obj = o; evas_object_color_set(o, 255,255,255,0); - evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, - _monitor_face_cb_mouse_down, face); + evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _monitor_face_cb_mouse_down, face); evas_object_show(o); /* setup gadman */ @@ -477,12 +444,10 @@ e_gadman_client_min_size_set(face->gmc, 14, 7); e_gadman_client_align_set(face->gmc, 1.0, 1.0); e_gadman_client_resize(face->gmc, 160, 40); - e_gadman_client_change_func_set(face->gmc, _monitor_face_cb_gmc_change, - face); + e_gadman_client_change_func_set(face->gmc, _monitor_face_cb_gmc_change, face); e_gadman_client_load(face->gmc); evas_event_thaw(con->bg_evas); - return face; } @@ -581,12 +546,12 @@ static void _monitor_wlan_link_text_update_callcack(Flow_Chart *chart, void *data) { - Monitor_Face *face; - char buf[64]; - long link = wlan_link_get(); - face = data; - snprintf(buf, 64, "LNK: %ld", link); - edje_object_part_text_set(face->wlan, "wlan-link-text", buf); + Monitor_Face *face; + char buf[64]; + long link = wlan_link_get(); + face = data; + snprintf(buf, 64, "LNK: %ld", link); + edje_object_part_text_set(face->wlan, "wlan-link-text", buf); } static void @@ -622,20 +587,17 @@ } static void -_monitor_face_cb_gmc_change(void *data, E_Gadman_Client *gmc, - E_Gadman_Change change) +_monitor_face_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gadman_Change change) { Monitor_Face *face; Evas_Coord x, y, w, h; - face = data; switch (change) { case E_GADMAN_CHANGE_MOVE_RESIZE: e_gadman_client_geometry_get(face->gmc, &x, &y, &w, &h); - evas_object_move(face->monitor_object, x, y); evas_object_resize(face->monitor_object, w, h); @@ -665,7 +627,6 @@ break; case E_GADMAN_CHANGE_RAISE: - //evas_object_raise(face->exit_event_object); break; case E_GADMAN_CHANGE_EDGE: @@ -687,8 +648,7 @@ } static void -_monitor_face_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, - void *event_info) +_monitor_face_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info) { Monitor_Face *face; Evas_Event_Mouse_Down *ev; @@ -732,11 +692,11 @@ static void _monitor_face_menu_new(Monitor_Face *face) { - E_Menu *mn; - E_Menu_Item *mi; - - mn = e_menu_new(); - face->menu = mn; + E_Menu *mn; + E_Menu_Item *mi; + + mn = e_menu_new(); + face->menu = mn; mi = e_menu_item_new(mn); e_menu_item_label_set(mi, _("Configuration")); @@ -749,9 +709,9 @@ void _monitor_cb_config_updated(void *data) { - Monitor_Face *face; - - face = data; + Monitor_Face *face; + + face = data; flow_chart_update_rate_set(flow_chart_cpu, face->conf->cpu_interval); mem_real_ignore_cached_set(face->conf->mem_real_ignore_cached); @@ -770,9 +730,9 @@ static void _monitor_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi) { - Monitor_Face *f; - - f = data; - if (!f) return; + Monitor_Face *f; + + f = data; + if (!f) return; _config_monitor_module(f->con, f); } |
From: <enl...@li...> - 2005-12-20 19:35:43
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : monitor Dir : e_modules/monitor Modified Files: e_mod_config.c Log Message: Fix Monitor Config Dialogue to allow changes to net device =================================================================== RCS file: /cvsroot/enlightenment/e_modules/monitor/e_mod_config.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_config.c 19 Dec 2005 21:00:08 -0000 1.1 +++ e_mod_config.c 20 Dec 2005 19:35:36 -0000 1.2 @@ -216,7 +216,8 @@ f->conf->net_interval = cfdata->net_interval; f->conf->mem_real_ignore_cached = cfdata->mem_real_ignore_cached; f->conf->mem_real_ignore_buffers = cfdata->mem_real_ignore_buffers; - + + i = 0; ecore_list_goto_first(net_interfaces); while ((tmp = ecore_list_next(net_interfaces)) != NULL) { |
From: <enl...@li...> - 2005-12-21 10:34:28
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : monitor Dir : e_modules/monitor Modified Files: e_mod_main.h Log Message: Add missing config proto =================================================================== RCS file: /cvsroot/enlightenment/e_modules/monitor/e_mod_main.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_mod_main.h 19 Dec 2005 21:00:08 -0000 1.2 +++ e_mod_main.h 21 Dec 2005 10:34:22 -0000 1.3 @@ -68,6 +68,7 @@ EAPI int e_modapi_save (E_Module *m); EAPI int e_modapi_info (E_Module *m); EAPI int e_modapi_about (E_Module *m); +EAPI int e_modapi_config (E_Module *m); EAPI void _monitor_cb_config_updated(void *data); #endif |
From: <enl...@li...> - 2005-12-27 21:19:46
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : monitor Dir : e_modules/monitor Modified Files: e_mod_main.h Log Message: Following raster's commit frenzy. Make symbol hiding work =================================================================== RCS file: /cvsroot/enlightenment/e_modules/monitor/e_mod_main.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_mod_main.h 24 Dec 2005 02:31:46 -0000 1.4 +++ e_mod_main.h 27 Dec 2005 21:19:41 -0000 1.5 @@ -66,7 +66,7 @@ E_Gadman_Client *gmc; }; -extern E_Module_Api e_modapi; +EAPI extern E_Module_Api e_modapi; EAPI void *e_modapi_init (E_Module *m); EAPI int e_modapi_shutdown (E_Module *m); @@ -75,7 +75,7 @@ EAPI int e_modapi_about (E_Module *m); EAPI int e_modapi_config (E_Module *m); -EAPI void _monitor_cb_config_updated(void *data); +void _monitor_cb_config_updated(void *data); void _monitor_face_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info); void rebuild_monitor(Monitor_Face *face); |
From: <enl...@li...> - 2005-12-30 13:18:18
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : monitor Dir : e_modules/monitor Modified Files: e_mod_main.c Log Message: Fix Config Functions to check for current container. Thanks HandyAndE :) =================================================================== RCS file: /cvsroot/enlightenment/e_modules/monitor/e_mod_main.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_mod_main.c 28 Dec 2005 16:51:31 -0000 1.6 +++ e_mod_main.c 30 Dec 2005 13:18:11 -0000 1.7 @@ -114,7 +114,7 @@ Monitor_Face *f; f = l->data; - if (f->mon == mon) + if (f->con == e_container_current_get(e_manager_current_get())) { _config_monitor_module(f->con, f); break; |
From: <enl...@li...> - 2005-12-30 14:28:23
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : monitor Dir : e_modules/monitor Modified Files: e_mod_main.c Log Message: Fix Config call for current container. Better trapping =================================================================== RCS file: /cvsroot/enlightenment/e_modules/monitor/e_mod_main.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- e_mod_main.c 30 Dec 2005 13:18:11 -0000 1.7 +++ e_mod_main.c 30 Dec 2005 14:28:13 -0000 1.8 @@ -109,11 +109,13 @@ Evas_List *l; mon = module->data; + if (!mon) reutrn 0; for (l = mon->faces; l; l = l->next) { Monitor_Face *f; f = l->data; + if (!f) return 0; if (f->con == e_container_current_get(e_manager_current_get())) { _config_monitor_module(f->con, f); @@ -1056,4 +1058,4 @@ edje_object_part_text_set(face->time,"time",curr_time); return 1; -} \ No newline at end of file +} |
From: <enl...@li...> - 2006-01-11 13:42:08
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : monitor Dir : e_modules/monitor Modified Files: e_mod_main.c Log Message: Check that the timer exists before we try and free it. Should stop the E segv that onefang found =================================================================== RCS file: /cvsroot/enlightenment/e_modules/monitor/e_mod_main.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- e_mod_main.c 30 Dec 2005 20:13:47 -0000 1.9 +++ e_mod_main.c 11 Jan 2006 13:41:55 -0000 1.10 @@ -622,7 +622,7 @@ { e_object_unref(E_OBJECT(face->con)); e_object_del(E_OBJECT(face->gmc)); - ecore_timer_del(face->date_check_timer); + if (face->date_check_timer) ecore_timer_del(face->date_check_timer); evas_object_del(face->cpu); evas_object_del(face->mem); |
From: <enl...@li...> - 2006-01-14 11:56:57
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : monitor Dir : e_modules/monitor Modified Files: e_mod_main.h e_mod_main.c monitor.edc Log Message: Formatting. Should now be possible to use enlightenment_remote to set the theme. EAPI fixes. =================================================================== RCS file: /cvsroot/enlightenment/e_modules/monitor/e_mod_main.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_mod_main.h 28 Dec 2005 16:47:12 -0000 1.6 +++ e_mod_main.h 14 Jan 2006 11:56:45 -0000 1.7 @@ -78,8 +78,8 @@ EAPI int e_modapi_about (E_Module *m); EAPI int e_modapi_config (E_Module *m); -void _monitor_cb_config_updated(void *data); -void _monitor_face_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info); -void rebuild_monitor(Monitor_Face *face); +static void _monitor_cb_config_updated(void *data); +static void _monitor_face_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info); +static void rebuild_monitor(Monitor_Face *face); #endif =================================================================== RCS file: /cvsroot/enlightenment/e_modules/monitor/e_mod_main.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- e_mod_main.c 11 Jan 2006 13:41:55 -0000 1.10 +++ e_mod_main.c 14 Jan 2006 11:56:45 -0000 1.11 @@ -4,8 +4,6 @@ #include <linux/unistd.h> /* for _syscallX macros/related stuff */ #include <linux/kernel.h> /* for struct sysinfo */ - - /* module private routines */ static Monitor *_monitor_new(); @@ -45,13 +43,13 @@ static Flow_Chart *flow_chart_wlan_link; /* public module routines. all modules must have these */ -E_Module_Api e_modapi = +EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Monitor" }; -void * +EAPI void * e_modapi_init(E_Module *module) { Monitor *monitor; @@ -62,7 +60,7 @@ return monitor; } -int +EAPI int e_modapi_shutdown(E_Module *module) { Monitor *monitor; @@ -77,7 +75,7 @@ return 1; } -int +EAPI int e_modapi_save(E_Module *module) { Monitor *monitor; @@ -87,14 +85,14 @@ return 1; } -int +EAPI int e_modapi_info(E_Module *module) { module->icon_file = strdup(PACKAGE_DATA_DIR "/module_icon.png"); return 1; } -int +EAPI int e_modapi_about(E_Module *module) { e_module_dialog_show(_("Enlightenment Monitor Module"), @@ -102,7 +100,7 @@ return 1; } -int +EAPI int e_modapi_config(E_Module *module) { Monitor *mon; @@ -324,7 +322,8 @@ char u_date_time[256]; struct sysinfo s_info; sysinfo (&s_info); - + char buff[4096]; + long minute = 60; long hour = minute * 60; long day = hour * 24; @@ -351,10 +350,12 @@ evas_event_freeze(con->bg_evas); + snprintf(buff, sizeof(buff), PACKAGE_DATA_DIR"/monitor.edj"); /* setup monitor object */ o = edje_object_add(con->bg_evas); face->monitor_object = o; - edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj", "monitor/main"); + if (!e_theme_edje_object_set(o, "base/theme/modules/monitor", "modules/monitor/main")) + edje_object_file_set(o, strdup(buff), "monitor/main"); evas_object_show(o); /* setup res table */ o = e_table_add(con->bg_evas); @@ -367,7 +368,8 @@ if (config->hostname) { face->hostname = edje_object_add(con->bg_evas); - edje_object_file_set(face->hostname, PACKAGE_DATA_DIR"/monitor.edj", "monitor/host"); + if (!e_theme_edje_object_set(face->hostname, "base/theme/modules/monitor", "modules/monitor/host")) + edje_object_file_set(face->hostname, strdup(buff), "modules/monitor/host"); _add_sensor(face,face->hostname,config->Horz); edje_object_part_text_set(face->hostname,"sysname",u_buf.sysname); edje_object_part_text_set(face->hostname,"release",u_buf.release); @@ -381,7 +383,8 @@ { o = edje_object_add(con->bg_evas); face->cpu = o; - edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj", "monitor/cpu"); + if (!e_theme_edje_object_set(o, "base/theme/modules/monitor", "modules/monitor/cpu")) + edje_object_file_set(o, strdup(buff), "modules/monitor/cpu"); _add_sensor(face, face->cpu,config->Horz); /* add cpu chart */ chart_con = chart_container_new(con->bg_evas,0,0,0,0); @@ -399,7 +402,8 @@ /* setup mem */ o = edje_object_add(con->bg_evas); face->mem = o; - edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj", "monitor/mem"); + if (!e_theme_edje_object_set(o, "base/theme/modules/monitor", "modules/monitor/mem")) + edje_object_file_set(o, strdup(buff), "modules/monitor/mem"); _add_sensor(face, face->mem,config->Horz); /* add mem charts */ chart_con = chart_container_new(con->bg_evas,0,0,0,0); @@ -424,7 +428,8 @@ /* setup net */ o = edje_object_add(con->bg_evas); face->net = o; - edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj", "monitor/net"); + if (!e_theme_edje_object_set(o, "base/theme/modules/monitor", "modules/monitor/net")) + edje_object_file_set(o, strdup(buff), "modules/monitor/net"); _add_sensor(face, face->net, config->Horz); /* add net charts */ chart_con = chart_container_new(con->bg_evas,0,0,0,0); @@ -450,7 +455,8 @@ /* setup wlan */ o = edje_object_add(con->bg_evas); face->wlan = o; - edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj", "monitor/wlan"); + if (!e_theme_edje_object_set(o, "base/theme/modules/monitor", "modules/monitor/wlan")) + edje_object_file_set(o, strdup(buff), "modules/monitor/wlan"); _add_sensor(face, face->wlan,config->Horz); /* add wlan charts */ chart_con = chart_container_new(con->bg_evas,0,0,0,0); @@ -465,7 +471,8 @@ if (config->uptime) { face->uptime = edje_object_add(con->bg_evas); - edje_object_file_set(face->uptime, PACKAGE_DATA_DIR"/monitor.edj", "monitor/uptime"); + if (!e_theme_edje_object_set(face->uptime, "base/theme/modules/monitor", "modules/monitor/uptime")) + edje_object_file_set(face->uptime, strdup(buff), "modules/monitor/uptime"); _add_sensor(face, face->uptime,config->Horz); sprintf (u_date_time,"uptime: %ld days, %ld:%02ld:%02ld", s_info.uptime / day, (s_info.uptime % day) / hour, @@ -482,7 +489,8 @@ date = *localtime(&now); face->time = edje_object_add(con->bg_evas); - edje_object_file_set(face->time, PACKAGE_DATA_DIR"/monitor.edj", "monitor/time"); + if (!e_theme_edje_object_set(face->time, "base/theme/modules/monitor", "modules/monitor/time")) + edje_object_file_set(face->time, strdup(buff), "modules/monitor/time"); _add_sensor(face, face->time,config->Horz); sprintf (curr_time,"%02d:%02d:%02d",date.tm_hour,date.tm_min,date.tm_sec); edje_object_part_text_set(face->time,"time",curr_time); @@ -624,13 +632,13 @@ e_object_del(E_OBJECT(face->gmc)); if (face->date_check_timer) ecore_timer_del(face->date_check_timer); - evas_object_del(face->cpu); - evas_object_del(face->mem); - evas_object_del(face->net); - evas_object_del(face->wlan); - evas_object_del(face->hostname); - evas_object_del(face->uptime); - evas_object_del(face->time); + if (face->cpu) evas_object_del(face->cpu); + if (face->mem) evas_object_del(face->mem); + if (face->net) evas_object_del(face->net); + if (face->wlan) evas_object_del(face->wlan); + if (face->hostname) evas_object_del(face->hostname); + if (face->uptime) evas_object_del(face->uptime); + if (face->time) evas_object_del(face->time); chart_container_del(face->chart_cpu); chart_container_del(face->chart_mem); @@ -704,7 +712,7 @@ e_gadman_mode_set(face->gmc->gadman, E_GADMAN_MODE_EDIT); } -void +static void _monitor_face_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info) { Monitor_Face *face; @@ -764,29 +772,36 @@ e_menu_item_callback_set(mi, _monitor_face_cb_menu_edit, face); } -void _monitor_cb_config_updated(void *data) +static void +_monitor_cb_config_updated(void *data) { Monitor_Face *face; face = data; - if (face->cpu) flow_chart_update_rate_set(flow_chart_cpu, face->conf->cpu_interval); + + if (face->cpu) + flow_chart_update_rate_set(flow_chart_cpu, face->conf->cpu_interval); - if (face->mem) mem_real_ignore_cached_set(face->conf->mem_real_ignore_cached); - { + if (face->mem) + { + mem_real_ignore_cached_set(face->conf->mem_real_ignore_cached); mem_real_ignore_buffers_set(face->conf->mem_real_ignore_buffers); flow_chart_update_rate_set(flow_chart_mem_real, face->conf->mem_interval); flow_chart_update_rate_set(flow_chart_mem_swap, face->conf->mem_interval); - } - - if (face->wlan) wlan_interface_set(face->conf->wlan_interface); - if (face->wlan) flow_chart_update_rate_set(flow_chart_wlan_link, face->conf->wlan_interval); + } + if (face->wlan) + { + wlan_interface_set(face->conf->wlan_interface); + flow_chart_update_rate_set(flow_chart_wlan_link, face->conf->wlan_interval); + } + if (face->net) - { + { net_interface_set(face->conf->net_interface); flow_chart_update_rate_set(flow_chart_net_in, face->conf->net_interval); flow_chart_update_rate_set(flow_chart_net_out, face->conf->net_interval); - } + } } static void @@ -798,6 +813,7 @@ if (!f) return; _config_monitor_module(f->con, f); } + static void _add_sensor(Monitor_Face *face, Evas_Object *o, int VerHor) { @@ -811,7 +827,8 @@ num_sensors++; } -void rebuild_monitor(Monitor_Face *face) +static void +rebuild_monitor(Monitor_Face *face) { struct utsname u_buf; uname (&u_buf); @@ -868,7 +885,8 @@ /* setup monitor object */ o = edje_object_add(face->con->bg_evas); face->monitor_object = o; - edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj", "monitor/main"); + if (!e_theme_edje_object_set(o, "base/theme/modules/monitor", "modules/monitor/main")) + edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj", "modules/monitor/main"); evas_object_show(o); /* setup res table */ o = e_table_add(face->con->bg_evas); @@ -880,7 +898,8 @@ if (face->mon->conf->hostname) { face->hostname = edje_object_add(face->con->bg_evas); - edje_object_file_set(face->hostname, PACKAGE_DATA_DIR"/monitor.edj", "monitor/host"); + if (!e_theme_edje_object_set(face->hostname, "base/theme/modules/monitor", "modules/monitor/host")) + edje_object_file_set(face->hostname, PACKAGE_DATA_DIR"/monitor.edj", "modules/monitor/host"); _add_sensor(face,face->hostname,face->mon->conf->Horz); edje_object_part_text_set(face->hostname,"sysname",u_buf.sysname); edje_object_part_text_set(face->hostname,"release",u_buf.release); @@ -894,7 +913,8 @@ { o = edje_object_add(face->con->bg_evas); face->cpu = o; - edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj", "monitor/cpu"); + if (!e_theme_edje_object_set(o, "base/theme/modules/monitor", "modules/monitor/cpu")) + edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj", "modules/monitor/cpu"); _add_sensor(face, face->cpu,face->mon->conf->Horz); /* add cpu chart */ chart_con = chart_container_new(face->con->bg_evas,0,0,0,0); @@ -912,7 +932,8 @@ /* setup mem */ o = edje_object_add(face->con->bg_evas); face->mem = o; - edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj", "monitor/mem"); + if (!e_theme_edje_object_set(o, "base/theme/modules/monitor", "modules/monitor/mem")) + edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj", "modules/monitor/mem"); _add_sensor(face, face->mem,face->mon->conf->Horz); /* add mem charts */ chart_con = chart_container_new(face->con->bg_evas,0,0,0,0); @@ -937,7 +958,8 @@ /* setup net */ o = edje_object_add(face->con->bg_evas); face->net = o; - edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj", "monitor/net"); + if (!e_theme_edje_object_set(o, "base/theme/modules/monitor", "modules/monitor/net")) + edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj", "modules/monitor/net"); _add_sensor(face, face->net, face->mon->conf->Horz); /* add net charts */ chart_con = chart_container_new(face->con->bg_evas,0,0,0,0); @@ -963,7 +985,8 @@ /* setup wlan */ o = edje_object_add(face->con->bg_evas); face->wlan = o; - edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj", "monitor/wlan"); + if (!e_theme_edje_object_set(o, "base/theme/modules/monitor", "modules/monitor/wlan")) + edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj", "modules/monitor/wlan"); _add_sensor(face, face->wlan,face->mon->conf->Horz); /* add wlan charts */ chart_con = chart_container_new(face->con->bg_evas,0,0,0,0); @@ -980,7 +1003,8 @@ int num_days, num_hours, num_min; char u_date_time[256]; face->uptime = edje_object_add(face->con->bg_evas); - edje_object_file_set(face->uptime, PACKAGE_DATA_DIR"/monitor.edj", "monitor/uptime"); + if (!e_theme_edje_object_set(face->uptime, "base/theme/modules/monitor", "modules/monitor/uptime")) + edje_object_file_set(face->uptime, PACKAGE_DATA_DIR"/monitor.edj", "modules/monitor/uptime"); sprintf (u_date_time,"uptime: %ld days, %ld:%02ld:%02ld", s_info.uptime / day, (s_info.uptime % day) / hour, (s_info.uptime % hour) / minute, s_info.uptime % minute); @@ -997,7 +1021,8 @@ date = *localtime(&now); face->time = edje_object_add(face->con->bg_evas); - edje_object_file_set(face->time, PACKAGE_DATA_DIR"/monitor.edj", "monitor/time"); + if (!e_theme_edje_object_set(face->time, "base/theme/modules/monitor", "modules/monitor/time")) + edje_object_file_set(face->time, PACKAGE_DATA_DIR"/monitor.edj", "modules/monitor/time"); _add_sensor(face, face->time,face->mon->conf->Horz); sprintf (curr_time,"%02d:%02d:%02d",date.tm_hour,date.tm_min,date.tm_sec); edje_object_part_text_set(face->time,"time",curr_time); @@ -1025,14 +1050,15 @@ e_gadman_client_load(face->gmc); evas_event_thaw(face->con->bg_evas); - } -static int _date_cb_check(void *data) + +static int +_date_cb_check(void *data) { Monitor_Face *face; face = data; -//Update uptime + //Update uptime char u_date_time[256]; struct sysinfo s_info; sysinfo (&s_info); @@ -1047,7 +1073,7 @@ (s_info.uptime % hour) / minute, s_info.uptime % minute); edje_object_part_text_set(face->uptime,"uptime",u_date_time); -//Update time + //Update time time_t now; struct tm date; time(&now); =================================================================== RCS file: /cvsroot/enlightenment/e_modules/monitor/monitor.edc,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- monitor.edc 29 Dec 2005 01:48:09 -0000 1.2 +++ monitor.edc 14 Jan 2006 11:56:45 -0000 1.3 @@ -19,7 +19,7 @@ { group { - name, "monitor/menu/cpu"; + name, "modules/monitor/menu/cpu"; parts { part { name, "background"; @@ -33,7 +33,7 @@ } }//close group menu/cpu group { - name, "monitor/menu/mem"; + name, "modules/monitor/menu/mem"; parts { part { name, "background"; @@ -47,7 +47,7 @@ } }//close group mem group { - name, "monitor/menu/net"; + name, "modules/monitor/menu/net"; parts { part { name, "background"; @@ -62,7 +62,7 @@ }//close group net group { - name, "monitor/menu/wlan"; + name, "modules/monitor/menu/wlan"; parts { part { name, "background"; @@ -77,7 +77,7 @@ }//close group wlan group { - name, "monitor/main"; + name, "modules/monitor/main"; parts { part { @@ -125,10 +125,8 @@ group { - name, "monitor/cpu"; - + name, "modules/monitor/cpu"; parts{ - part { name, "overlay"; mouse_events, 0; @@ -150,7 +148,6 @@ } } - part { name, "cpu"; mouse_events, 0; @@ -184,20 +181,14 @@ align, 1.0 0.0; } } - } - - + } } - }//close group cpu - group { - name, "monitor/mem"; - + name, "modules/monitor/mem"; parts{ - part { name, "overlay"; mouse_events, 0; @@ -284,10 +275,8 @@ group { - name, "monitor/net"; - + name, "modules/monitor/net"; parts{ - part { name, "overlay"; mouse_events, 0; @@ -373,7 +362,7 @@ }//close group net group { - name, "monitor/wlan"; + name, "modules/monitor/wlan"; parts { part { name, "overlay"; @@ -433,7 +422,7 @@ }//close group wlan group { - name, "monitor/host"; + name, "modules/monitor/host"; parts { part { name, "overlay"; @@ -516,7 +505,7 @@ } }//close group hostname group { - name, "monitor/uptime"; + name, "modules/monitor/uptime"; parts { part { name, "overlay"; @@ -562,7 +551,7 @@ }//close group uptime group { - name, "monitor/time"; + name, "modules/monitor/time"; parts { part { name, "overlay"; |
From: <enl...@li...> - 2006-01-14 12:54:36
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : monitor Dir : e_modules/monitor Modified Files: e_mod_main.c Log Message: Removal of the strdup. =================================================================== RCS file: /cvsroot/enlightenment/e_modules/monitor/e_mod_main.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- e_mod_main.c 14 Jan 2006 11:56:45 -0000 1.11 +++ e_mod_main.c 14 Jan 2006 12:54:30 -0000 1.12 @@ -355,7 +355,7 @@ o = edje_object_add(con->bg_evas); face->monitor_object = o; if (!e_theme_edje_object_set(o, "base/theme/modules/monitor", "modules/monitor/main")) - edje_object_file_set(o, strdup(buff), "monitor/main"); + edje_object_file_set(o, buff, "monitor/main"); evas_object_show(o); /* setup res table */ o = e_table_add(con->bg_evas); @@ -369,7 +369,7 @@ { face->hostname = edje_object_add(con->bg_evas); if (!e_theme_edje_object_set(face->hostname, "base/theme/modules/monitor", "modules/monitor/host")) - edje_object_file_set(face->hostname, strdup(buff), "modules/monitor/host"); + edje_object_file_set(face->hostname, buff, "modules/monitor/host"); _add_sensor(face,face->hostname,config->Horz); edje_object_part_text_set(face->hostname,"sysname",u_buf.sysname); edje_object_part_text_set(face->hostname,"release",u_buf.release); @@ -384,7 +384,7 @@ o = edje_object_add(con->bg_evas); face->cpu = o; if (!e_theme_edje_object_set(o, "base/theme/modules/monitor", "modules/monitor/cpu")) - edje_object_file_set(o, strdup(buff), "modules/monitor/cpu"); + edje_object_file_set(o, buff, "modules/monitor/cpu"); _add_sensor(face, face->cpu,config->Horz); /* add cpu chart */ chart_con = chart_container_new(con->bg_evas,0,0,0,0); @@ -403,7 +403,7 @@ o = edje_object_add(con->bg_evas); face->mem = o; if (!e_theme_edje_object_set(o, "base/theme/modules/monitor", "modules/monitor/mem")) - edje_object_file_set(o, strdup(buff), "modules/monitor/mem"); + edje_object_file_set(o, buff, "modules/monitor/mem"); _add_sensor(face, face->mem,config->Horz); /* add mem charts */ chart_con = chart_container_new(con->bg_evas,0,0,0,0); @@ -429,7 +429,7 @@ o = edje_object_add(con->bg_evas); face->net = o; if (!e_theme_edje_object_set(o, "base/theme/modules/monitor", "modules/monitor/net")) - edje_object_file_set(o, strdup(buff), "modules/monitor/net"); + edje_object_file_set(o, buff, "modules/monitor/net"); _add_sensor(face, face->net, config->Horz); /* add net charts */ chart_con = chart_container_new(con->bg_evas,0,0,0,0); @@ -456,7 +456,7 @@ o = edje_object_add(con->bg_evas); face->wlan = o; if (!e_theme_edje_object_set(o, "base/theme/modules/monitor", "modules/monitor/wlan")) - edje_object_file_set(o, strdup(buff), "modules/monitor/wlan"); + edje_object_file_set(o, buff, "modules/monitor/wlan"); _add_sensor(face, face->wlan,config->Horz); /* add wlan charts */ chart_con = chart_container_new(con->bg_evas,0,0,0,0); @@ -472,7 +472,7 @@ { face->uptime = edje_object_add(con->bg_evas); if (!e_theme_edje_object_set(face->uptime, "base/theme/modules/monitor", "modules/monitor/uptime")) - edje_object_file_set(face->uptime, strdup(buff), "modules/monitor/uptime"); + edje_object_file_set(face->uptime, buff, "modules/monitor/uptime"); _add_sensor(face, face->uptime,config->Horz); sprintf (u_date_time,"uptime: %ld days, %ld:%02ld:%02ld", s_info.uptime / day, (s_info.uptime % day) / hour, @@ -490,7 +490,7 @@ date = *localtime(&now); face->time = edje_object_add(con->bg_evas); if (!e_theme_edje_object_set(face->time, "base/theme/modules/monitor", "modules/monitor/time")) - edje_object_file_set(face->time, strdup(buff), "modules/monitor/time"); + edje_object_file_set(face->time, buff, "modules/monitor/time"); _add_sensor(face, face->time,config->Horz); sprintf (curr_time,"%02d:%02d:%02d",date.tm_hour,date.tm_min,date.tm_sec); edje_object_part_text_set(face->time,"time",curr_time); |
From: <enl...@li...> - 2006-01-15 08:05:17
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : monitor Dir : e_modules/monitor Modified Files: e_mod_main.h e_mod_main.c e_mod_config.c Log Message: Formatting. E_Config_Dialog_Data fixes. Function Proto fixes. =================================================================== RCS file: /cvsroot/enlightenment/e_modules/monitor/e_mod_main.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- e_mod_main.h 14 Jan 2006 11:56:45 -0000 1.7 +++ e_mod_main.h 15 Jan 2006 08:05:09 -0000 1.8 @@ -78,8 +78,7 @@ EAPI int e_modapi_about (E_Module *m); EAPI int e_modapi_config (E_Module *m); -static void _monitor_cb_config_updated(void *data); -static void _monitor_face_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info); -static void rebuild_monitor(Monitor_Face *face); +void _monitor_cb_config_updated(void *data); +void rebuild_monitor(Monitor_Face *face); #endif =================================================================== RCS file: /cvsroot/enlightenment/e_modules/monitor/e_mod_main.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- e_mod_main.c 14 Jan 2006 12:54:30 -0000 1.12 +++ e_mod_main.c 15 Jan 2006 08:05:09 -0000 1.13 @@ -13,8 +13,7 @@ static Monitor_Face *_monitor_face_new(E_Container *con, Config *config); static void _monitor_face_free(Monitor_Face *face); static void _monitor_face_menu_new(Monitor_Face *face); -static void _monitor_face_cb_gmc_change(void *data, E_Gadman_Client *gmc, - E_Gadman_Change change); +static void _monitor_face_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gadman_Change change); Config_Face * _monitor_face_config_init(Config_Face *conf); static int _monitor_face_config_cb_timer(void *data); @@ -29,6 +28,8 @@ static void _add_sensor(Monitor_Face *face, Evas_Object *o, int VerHor); static int _date_cb_check(void *data); +static void _monitor_face_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info); + static int _monitor_count; static int num_sensors; @@ -224,7 +225,7 @@ face = _monitor_face_new(con,monitor->conf); if (face) { - face->mon = monitor; + face->mon = monitor; monitor->faces = evas_list_append(monitor->faces, face); /* Config */ if (!cl) @@ -282,6 +283,8 @@ flow_chart_update_rate_set(flow_chart_net_out, face->conf->net_interval); if (monitor->conf->wlan) flow_chart_update_rate_set(flow_chart_wlan_link, face->conf->wlan_interval); + + rebuild_monitor(face); } } } @@ -322,7 +325,6 @@ char u_date_time[256]; struct sysinfo s_info; sysinfo (&s_info); - char buff[4096]; long minute = 60; long hour = minute * 60; @@ -350,13 +352,13 @@ evas_event_freeze(con->bg_evas); - snprintf(buff, sizeof(buff), PACKAGE_DATA_DIR"/monitor.edj"); /* setup monitor object */ o = edje_object_add(con->bg_evas); face->monitor_object = o; if (!e_theme_edje_object_set(o, "base/theme/modules/monitor", "modules/monitor/main")) - edje_object_file_set(o, buff, "monitor/main"); + edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj", "monitor/main"); evas_object_show(o); + /* setup res table */ o = e_table_add(con->bg_evas); face->table_object = o; @@ -369,7 +371,7 @@ { face->hostname = edje_object_add(con->bg_evas); if (!e_theme_edje_object_set(face->hostname, "base/theme/modules/monitor", "modules/monitor/host")) - edje_object_file_set(face->hostname, buff, "modules/monitor/host"); + edje_object_file_set(face->hostname, PACKAGE_DATA_DIR"/monitor.edj", "modules/monitor/host"); _add_sensor(face,face->hostname,config->Horz); edje_object_part_text_set(face->hostname,"sysname",u_buf.sysname); edje_object_part_text_set(face->hostname,"release",u_buf.release); @@ -384,8 +386,9 @@ o = edje_object_add(con->bg_evas); face->cpu = o; if (!e_theme_edje_object_set(o, "base/theme/modules/monitor", "modules/monitor/cpu")) - edje_object_file_set(o, buff, "modules/monitor/cpu"); + edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj", "modules/monitor/cpu"); _add_sensor(face, face->cpu,config->Horz); + /* add cpu chart */ chart_con = chart_container_new(con->bg_evas,0,0,0,0); flow_chart_cpu = flow_chart_new(); @@ -395,16 +398,17 @@ chart_container_chart_add(chart_con, flow_chart_cpu); face->chart_cpu = chart_con; flow_chart_callback_set(flow_chart_cpu, _monitor_cpu_text_update_callcack, face); - } + if (config->mem) { /* setup mem */ o = edje_object_add(con->bg_evas); face->mem = o; if (!e_theme_edje_object_set(o, "base/theme/modules/monitor", "modules/monitor/mem")) - edje_object_file_set(o, buff, "modules/monitor/mem"); + edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj", "modules/monitor/mem"); _add_sensor(face, face->mem,config->Horz); + /* add mem charts */ chart_con = chart_container_new(con->bg_evas,0,0,0,0); flow_chart_mem_real = flow_chart_new(); @@ -423,14 +427,16 @@ chart_container_chart_add(chart_con, flow_chart_mem_swap); flow_chart_callback_set(flow_chart_mem_swap, _monitor_mem_swap_text_update_callback, face); } + if (config->net) { /* setup net */ o = edje_object_add(con->bg_evas); face->net = o; if (!e_theme_edje_object_set(o, "base/theme/modules/monitor", "modules/monitor/net")) - edje_object_file_set(o, buff, "modules/monitor/net"); + edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj", "modules/monitor/net"); _add_sensor(face, face->net, config->Horz); + /* add net charts */ chart_con = chart_container_new(con->bg_evas,0,0,0,0); flow_chart_net_in = flow_chart_new(); @@ -456,8 +462,9 @@ o = edje_object_add(con->bg_evas); face->wlan = o; if (!e_theme_edje_object_set(o, "base/theme/modules/monitor", "modules/monitor/wlan")) - edje_object_file_set(o, buff, "modules/monitor/wlan"); + edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj", "modules/monitor/wlan"); _add_sensor(face, face->wlan,config->Horz); + /* add wlan charts */ chart_con = chart_container_new(con->bg_evas,0,0,0,0); flow_chart_wlan_link = flow_chart_new(); @@ -468,11 +475,12 @@ face->chart_wlan = chart_con; flow_chart_callback_set(flow_chart_wlan_link, _monitor_wlan_link_text_update_callcack, face); } + if (config->uptime) { face->uptime = edje_object_add(con->bg_evas); if (!e_theme_edje_object_set(face->uptime, "base/theme/modules/monitor", "modules/monitor/uptime")) - edje_object_file_set(face->uptime, buff, "modules/monitor/uptime"); + edje_object_file_set(face->uptime, PACKAGE_DATA_DIR"/monitor.edj", "modules/monitor/uptime"); _add_sensor(face, face->uptime,config->Horz); sprintf (u_date_time,"uptime: %ld days, %ld:%02ld:%02ld", s_info.uptime / day, (s_info.uptime % day) / hour, @@ -480,6 +488,7 @@ edje_object_part_text_set(face->uptime,"uptime",u_date_time); face->date_check_timer = ecore_timer_add(1, _date_cb_check,face); } + if (config->time) { time_t now; @@ -490,7 +499,7 @@ date = *localtime(&now); face->time = edje_object_add(con->bg_evas); if (!e_theme_edje_object_set(face->time, "base/theme/modules/monitor", "modules/monitor/time")) - edje_object_file_set(face->time, buff, "modules/monitor/time"); + edje_object_file_set(face->time, PACKAGE_DATA_DIR"/monitor.edj", "modules/monitor/time"); _add_sensor(face, face->time,config->Horz); sprintf (curr_time,"%02d:%02d:%02d",date.tm_hour,date.tm_min,date.tm_sec); edje_object_part_text_set(face->time,"time",curr_time); @@ -772,7 +781,7 @@ e_menu_item_callback_set(mi, _monitor_face_cb_menu_edit, face); } -static void +void _monitor_cb_config_updated(void *data) { Monitor_Face *face; @@ -827,7 +836,7 @@ num_sensors++; } -static void +void rebuild_monitor(Monitor_Face *face) { struct utsname u_buf; =================================================================== RCS file: /cvsroot/enlightenment/e_modules/monitor/e_mod_config.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- e_mod_config.c 14 Jan 2006 15:55:42 -0000 1.5 +++ e_mod_config.c 15 Jan 2006 08:05:09 -0000 1.6 @@ -1,9 +1,8 @@ -#include "e.h" +#include <e.h> #include "e_mod_main.h" #include "e_mod_config.h" #include "config.h" -typedef struct _cfdata CFData; typedef struct _Cfg_File_Data Cfg_File_Data; int net_interface_count; @@ -14,7 +13,7 @@ int wlan_interface_number; Ecore_List *wlan_interfaces = NULL; -struct _cfdata +struct _E_Config_Dialog_Data { double cpu_interval; double mem_interval; @@ -36,11 +35,11 @@ /* Protos */ static void *_create_data(E_Config_Dialog *cfd); -static void _free_data(E_Config_Dialog *cfd, void *data); -static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data); -static int _basic_apply_data(E_Config_Dialog *cfd, void *data); -static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data); -static int _advanced_apply_data(E_Config_Dialog *cfd, void *data); +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 Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); +static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); void _config_monitor_module(E_Container *con, Monitor_Face *f) @@ -59,7 +58,7 @@ } static void -_fill_data(Monitor_Face *f, CFData *cfdata) +_fill_data(Monitor_Face *f, E_Config_Dialog_Data *cfdata) { char *tmp; int i = 0; @@ -94,39 +93,34 @@ } } -static void -*_create_data(E_Config_Dialog *cfd) +static void * +_create_data(E_Config_Dialog *cfd) { - CFData *cfdata; + E_Config_Dialog_Data *cfdata; Monitor_Face *f; f = cfd->data; - cfdata = E_NEW(CFData, 1); + cfdata = E_NEW(E_Config_Dialog_Data, 1); _fill_data(f, cfdata); return cfdata; } static void -_free_data(E_Config_Dialog *cfd, void *data) +_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) { - CFData *cfdata; - cfdata = data; free(cfdata); } -static Evas_Object -*_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data) +static Evas_Object * +_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *o, *of, *ob, *ob1, *ob2, *ob3, *ob4, *ob5, *ob6, *ob7,*ot; E_Radio_Group *rg; - CFData *cfdata; - cfdata = data; char *tmp; int i; Monitor_Face *f; Monitor *mon; - f = cfd->data; mon = f->mon; @@ -157,22 +151,20 @@ } static int -_basic_apply_data(E_Config_Dialog *cfd, void *data) +_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) { - CFData *cfdata; - cfdata = data; Monitor_Face *face; + face = cfd->data; rebuild_monitor(face); return 1; } + static Evas_Object * -_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data) +_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *o, *of, *ob, *ot; E_Radio_Group *rg; - CFData *cfdata; - cfdata = data; char *tmp; int i; Monitor_Face *f; @@ -248,15 +240,14 @@ return o; } + static int -_advanced_apply_data(E_Config_Dialog *cfd, void *data) +_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) { Monitor_Face *f; - CFData *cfdata; char *tmp; int i; - cfdata = data; f = cfd->data; e_border_button_bindings_ungrab_all(); |
From: <enl...@li...> - 2006-01-22 14:16:13
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : monitor Dir : e_modules/monitor Modified Files: e_mod_config.c Log Message: Fixes for E_Config_Dialog_View =================================================================== RCS file: /cvsroot/enlightenment/e_modules/monitor/e_mod_config.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_mod_config.c 15 Jan 2006 08:05:09 -0000 1.6 +++ e_mod_config.c 22 Jan 2006 14:16:08 -0000 1.7 @@ -45,16 +45,18 @@ _config_monitor_module(E_Container *con, Monitor_Face *f) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; - v.create_cfdata = _create_data; - v.free_cfdata = _free_data; - v.basic.apply_cfdata = _basic_apply_data; - v.basic.create_widgets = _basic_create_widgets; - v.advanced.apply_cfdata = _advanced_apply_data; - v.advanced.create_widgets = _advanced_create_widgets; + v = E_NEW(E_Config_Dialog_View, 1); - cfd = e_config_dialog_new(con, _("Monitor Configuration"), NULL, 0, &v, f); + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _basic_apply_data; + v->basic.create_widgets = _basic_create_widgets; + v->advanced.apply_cfdata = _advanced_apply_data; + v->advanced.create_widgets = _advanced_create_widgets; + + cfd = e_config_dialog_new(con, _("Monitor Configuration"), NULL, 0, v, f); } static void |
From: <enl...@li...> - 2006-01-24 21:35:46
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : monitor Dir : e_modules/monitor Modified Files: e_mod_main.c e_mod_config.c Log Message: Fix Segfault on Monitor Configure. Fix for when changing config options the module would move to the corner =================================================================== RCS file: /cvsroot/enlightenment/e_modules/monitor/e_mod_main.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- e_mod_main.c 21 Jan 2006 11:03:15 -0000 1.14 +++ e_mod_main.c 24 Jan 2006 21:35:37 -0000 1.15 @@ -676,12 +676,16 @@ switch (change) { case E_GADMAN_CHANGE_MOVE_RESIZE: - e_gadman_client_geometry_get(face->gmc, &x, &y, &w, &h); + e_gadman_client_geometry_get(face->gmc, &x, &y, &w, &h); - evas_object_move(face->monitor_object, x, y); - evas_object_resize(face->monitor_object, w, h); - evas_object_move(face->monitor_cover_obj, x, y); - evas_object_resize(face->monitor_cover_obj, w, h); + evas_object_move(face->monitor_object, x, y); + evas_object_resize(face->monitor_object, w, h); + + evas_object_move(face->table_object, x, y); + evas_object_resize(face->table_object, w, h); + + evas_object_move(face->monitor_cover_obj, x, y); + evas_object_resize(face->monitor_cover_obj, w, h); if (face->cpu) evas_object_geometry_get(face->cpu, &x, &y, &w, &h); if (face->cpu) chart_container_move(face->chart_cpu, x+2,y+2); @@ -710,6 +714,7 @@ */ break; } + e_gadman_client_save(face->gmc); } static void @@ -855,195 +860,266 @@ Monitor_Face *f; num_sensors = 0; - - e_object_del(E_OBJECT(face->gmc)); - - if (face->cpu) evas_object_del(face->cpu); - face->cpu = NULL; - if (face->mem) evas_object_del(face->mem); - face->mem = NULL; - if (face->net) evas_object_del(face->net); - face->net = NULL; - if (face->wlan) evas_object_del(face->wlan); - face->wlan = NULL; - if (face->hostname) evas_object_del(face->hostname); - face->hostname = NULL; - if (face->uptime) evas_object_del(face->uptime); - face->uptime = NULL; - if (face->time) evas_object_del(face->uptime); - face->time = NULL; - - if (face->chart_cpu) chart_container_del(face->chart_cpu); - face->chart_cpu = NULL; - if (face->chart_mem) chart_container_del(face->chart_mem); - face->chart_mem = NULL; - if (face->chart_net) chart_container_del(face->chart_net); - face->chart_net = NULL; - if (face->chart_wlan) chart_container_del(face->chart_wlan); - face->chart_wlan = NULL; - - if (face->monitor_object) evas_object_del(face->monitor_object); - if (face->table_object) evas_object_del(face->table_object); - + e_object_del(E_OBJECT(face->menu)); Evas_Object *o; evas_event_freeze(face->con->bg_evas); + if (face->gmc) e_gadman_client_save(face->gmc); + /* setup monitor object */ + if (face->monitor_object) evas_object_del(face->monitor_object); o = edje_object_add(face->con->bg_evas); face->monitor_object = o; if (!e_theme_edje_object_set(o, "base/theme/modules/monitor", "modules/monitor/main")) edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj", "modules/monitor/main"); evas_object_show(o); + /* setup res table */ + if (face->table_object) evas_object_del(face->table_object); o = e_table_add(face->con->bg_evas); face->table_object = o; e_table_homogenous_set(o, 1); edje_object_part_swallow(face->monitor_object, "items", face->table_object); evas_object_show(o); + /*setup hostname */ if (face->mon->conf->hostname) - { + { + if (face->hostname) evas_object_del(face->hostname); face->hostname = edje_object_add(face->con->bg_evas); - if (!e_theme_edje_object_set(face->hostname, "base/theme/modules/monitor", "modules/monitor/host")) - edje_object_file_set(face->hostname, PACKAGE_DATA_DIR"/monitor.edj", "modules/monitor/host"); + if (!e_theme_edje_object_set(face->hostname, "base/theme/modules/monitor", "modules/monitor/host")) + edje_object_file_set(face->hostname, PACKAGE_DATA_DIR"/monitor.edj", "modules/monitor/host"); _add_sensor(face,face->hostname,face->mon->conf->Horz); edje_object_part_text_set(face->hostname,"sysname",u_buf.sysname); edje_object_part_text_set(face->hostname,"release",u_buf.release); edje_object_part_text_set(face->hostname,"version",u_buf.version); edje_object_part_text_set(face->hostname,"machine",u_buf.machine); //edje_object_part_text_set(face->hostname,"node",u_buf.node); - } - + } + else if (face->hostname) + { + evas_object_del(face->hostname); + face->hostname = NULL; + } + /* setup cpu */ if (face->mon->conf->cpu) - { - o = edje_object_add(face->con->bg_evas); - face->cpu = o; - if (!e_theme_edje_object_set(o, "base/theme/modules/monitor", "modules/monitor/cpu")) - edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj", "modules/monitor/cpu"); - _add_sensor(face, face->cpu,face->mon->conf->Horz); - /* add cpu chart */ - chart_con = chart_container_new(face->con->bg_evas,0,0,0,0); - flow_chart_cpu = flow_chart_new(); - flow_chart_color_set(flow_chart_cpu, 33, 100, 220, 125); - flow_chart_get_value_function_set(flow_chart_cpu, cpu_usage_get); - flow_chart_update_rate_set(flow_chart_cpu, face->conf->cpu_interval); - chart_container_chart_add(chart_con, flow_chart_cpu); - face->chart_cpu = chart_con; - flow_chart_callback_set(flow_chart_cpu, _monitor_cpu_text_update_callcack, face); + { + if (face->cpu) evas_object_del(face->cpu); + if (face->chart_cpu) chart_container_del(face->chart_cpu); + o = edje_object_add(face->con->bg_evas); + face->cpu = o; + if (!e_theme_edje_object_set(o, "base/theme/modules/monitor", "modules/monitor/cpu")) + edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj", "modules/monitor/cpu"); + _add_sensor(face, face->cpu,face->mon->conf->Horz); + /* add cpu chart */ + chart_con = chart_container_new(face->con->bg_evas,0,0,0,0); + flow_chart_cpu = flow_chart_new(); + flow_chart_color_set(flow_chart_cpu, 33, 100, 220, 125); + flow_chart_get_value_function_set(flow_chart_cpu, cpu_usage_get); + flow_chart_update_rate_set(flow_chart_cpu, face->conf->cpu_interval); + chart_container_chart_add(chart_con, flow_chart_cpu); + face->chart_cpu = chart_con; + flow_chart_callback_set(flow_chart_cpu, _monitor_cpu_text_update_callcack, face); - } + } + else if (face->cpu) + { + evas_object_del(face->cpu); + if (face->chart_cpu) chart_container_del(face->chart_cpu); + face->chart_cpu = NULL; + face->cpu = NULL; + } + if (face->mon->conf->mem) - { - /* setup mem */ - o = edje_object_add(face->con->bg_evas); - face->mem = o; - if (!e_theme_edje_object_set(o, "base/theme/modules/monitor", "modules/monitor/mem")) - edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj", "modules/monitor/mem"); - _add_sensor(face, face->mem,face->mon->conf->Horz); - /* add mem charts */ - chart_con = chart_container_new(face->con->bg_evas,0,0,0,0); - flow_chart_mem_real = flow_chart_new(); - flow_chart_color_set(flow_chart_mem_real, 213, 91, 91, 125); - flow_chart_get_value_function_set(flow_chart_mem_real, mem_real_usage_get); - flow_chart_update_rate_set(flow_chart_mem_real, face->conf->mem_interval); - chart_container_chart_add(chart_con, flow_chart_mem_real); - face->chart_mem = chart_con; - flow_chart_callback_set(flow_chart_mem_real, _monitor_mem_real_text_update_callback, face); - - flow_chart_mem_swap = flow_chart_new(); - flow_chart_color_set(flow_chart_mem_swap, 51, 181, 69, 125); - flow_chart_get_value_function_set(flow_chart_mem_swap, mem_swap_usage_get); - flow_chart_update_rate_set(flow_chart_mem_swap, face->conf->mem_interval); - flow_chart_alignment_set(flow_chart_mem_swap, 0); - chart_container_chart_add(chart_con, flow_chart_mem_swap); - flow_chart_callback_set(flow_chart_mem_swap, _monitor_mem_swap_text_update_callback, face); - } + { + if (face->mem) evas_object_del(face->mem); + if (face->chart_mem) chart_container_del(face->chart_mem); + + /* setup mem */ + o = edje_object_add(face->con->bg_evas); + face->mem = o; + if (!e_theme_edje_object_set(o, "base/theme/modules/monitor", "modules/monitor/mem")) + edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj", "modules/monitor/mem"); + _add_sensor(face, face->mem,face->mon->conf->Horz); + /* add mem charts */ + chart_con = chart_container_new(face->con->bg_evas,0,0,0,0); + flow_chart_mem_real = flow_chart_new(); + flow_chart_color_set(flow_chart_mem_real, 213, 91, 91, 125); + flow_chart_get_value_function_set(flow_chart_mem_real, mem_real_usage_get); + flow_chart_update_rate_set(flow_chart_mem_real, face->conf->mem_interval); + chart_container_chart_add(chart_con, flow_chart_mem_real); + face->chart_mem = chart_con; + flow_chart_callback_set(flow_chart_mem_real, _monitor_mem_real_text_update_callback, face); + + flow_chart_mem_swap = flow_chart_new(); + flow_chart_color_set(flow_chart_mem_swap, 51, 181, 69, 125); + flow_chart_get_value_function_set(flow_chart_mem_swap, mem_swap_usage_get); + flow_chart_update_rate_set(flow_chart_mem_swap, face->conf->mem_interval); + flow_chart_alignment_set(flow_chart_mem_swap, 0); + chart_container_chart_add(chart_con, flow_chart_mem_swap); + flow_chart_callback_set(flow_chart_mem_swap, _monitor_mem_swap_text_update_callback, face); + } + else if (face->mem) + { + evas_object_del(face->mem); + if (face->chart_mem) chart_container_del(face->chart_mem); + face->chart_mem = NULL; + face->mem = NULL; + } + if (face->mon->conf->net) - { - /* setup net */ - o = edje_object_add(face->con->bg_evas); - face->net = o; - if (!e_theme_edje_object_set(o, "base/theme/modules/monitor", "modules/monitor/net")) - edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj", "modules/monitor/net"); - _add_sensor(face, face->net, face->mon->conf->Horz); - /* add net charts */ - chart_con = chart_container_new(face->con->bg_evas,0,0,0,0); - flow_chart_net_in = flow_chart_new(); - flow_chart_color_set(flow_chart_net_in, 213, 91, 91, 125); - flow_chart_get_value_function_set(flow_chart_net_in, net_in_usage_get); - flow_chart_update_rate_set(flow_chart_net_in, face->conf->net_interval); - chart_container_chart_add(chart_con, flow_chart_net_in); - face->chart_net = chart_con; - flow_chart_callback_set(flow_chart_net_in, _monitor_net_in_text_update_callcack, face); - - flow_chart_net_out = flow_chart_new(); - flow_chart_color_set(flow_chart_net_out, 51, 181, 69, 125); - flow_chart_get_value_function_set(flow_chart_net_out, net_out_usage_get); - flow_chart_update_rate_set(flow_chart_net_out, face->conf->net_interval); - flow_chart_alignment_set(flow_chart_net_out, 0); - chart_container_chart_add(chart_con, flow_chart_net_out); - flow_chart_callback_set(flow_chart_net_out, _monitor_net_out_text_update_callcack, face); - } - + { + if (face->net) evas_object_del(face->net); + if (face->chart_net) chart_container_del(face->chart_net); + + /* setup net */ + o = edje_object_add(face->con->bg_evas); + face->net = o; + if (!e_theme_edje_object_set(o, "base/theme/modules/monitor", "modules/monitor/net")) + edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj", "modules/monitor/net"); + _add_sensor(face, face->net, face->mon->conf->Horz); + /* add net charts */ + chart_con = chart_container_new(face->con->bg_evas,0,0,0,0); + flow_chart_net_in = flow_chart_new(); + flow_chart_color_set(flow_chart_net_in, 213, 91, 91, 125); + flow_chart_get_value_function_set(flow_chart_net_in, net_in_usage_get); + flow_chart_update_rate_set(flow_chart_net_in, face->conf->net_interval); + chart_container_chart_add(chart_con, flow_chart_net_in); + face->chart_net = chart_con; + flow_chart_callback_set(flow_chart_net_in, _monitor_net_in_text_update_callcack, face); + + flow_chart_net_out = flow_chart_new(); + flow_chart_color_set(flow_chart_net_out, 51, 181, 69, 125); + flow_chart_get_value_function_set(flow_chart_net_out, net_out_usage_get); + flow_chart_update_rate_set(flow_chart_net_out, face->conf->net_interval); + flow_chart_alignment_set(flow_chart_net_out, 0); + chart_container_chart_add(chart_con, flow_chart_net_out); + flow_chart_callback_set(flow_chart_net_out, _monitor_net_out_text_update_callcack, face); + } + else if (face->net) + { + evas_object_del(face->net); + if (face->chart_net) chart_container_del(face->chart_net); + face->chart_net = NULL; + face->net = NULL; + } + if (face->mon->conf->wlan) - { - /* setup wlan */ - o = edje_object_add(face->con->bg_evas); - face->wlan = o; - if (!e_theme_edje_object_set(o, "base/theme/modules/monitor", "modules/monitor/wlan")) - edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj", "modules/monitor/wlan"); - _add_sensor(face, face->wlan,face->mon->conf->Horz); - /* add wlan charts */ - chart_con = chart_container_new(face->con->bg_evas,0,0,0,0); - flow_chart_wlan_link = flow_chart_new(); - flow_chart_color_set(flow_chart_wlan_link, 33, 100, 220, 125); - flow_chart_get_value_function_set(flow_chart_wlan_link, wlan_link_get); - flow_chart_update_rate_set(flow_chart_wlan_link, face->conf->wlan_interval); - chart_container_chart_add(chart_con, flow_chart_wlan_link); - face->chart_wlan = chart_con; - flow_chart_callback_set(flow_chart_wlan_link, _monitor_wlan_link_text_update_callcack, face); - } + { + if (face->wlan) evas_object_del(face->wlan); + if (face->chart_wlan) chart_container_del(face->chart_wlan); + + /* setup wlan */ + o = edje_object_add(face->con->bg_evas); + face->wlan = o; + if (!e_theme_edje_object_set(o, "base/theme/modules/monitor", "modules/monitor/wlan")) + edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj", "modules/monitor/wlan"); + _add_sensor(face, face->wlan,face->mon->conf->Horz); + /* add wlan charts */ + chart_con = chart_container_new(face->con->bg_evas,0,0,0,0); + flow_chart_wlan_link = flow_chart_new(); + flow_chart_color_set(flow_chart_wlan_link, 33, 100, 220, 125); + flow_chart_get_value_function_set(flow_chart_wlan_link, wlan_link_get); + flow_chart_update_rate_set(flow_chart_wlan_link, face->conf->wlan_interval); + chart_container_chart_add(chart_con, flow_chart_wlan_link); + face->chart_wlan = chart_con; + flow_chart_callback_set(flow_chart_wlan_link, _monitor_wlan_link_text_update_callcack, face); + } + else if (face->wlan) + { + evas_object_del(face->wlan); + if (face->chart_wlan) chart_container_del(face->chart_wlan); + face->chart_wlan = NULL; + face->wlan = NULL; + } + if (face->mon->conf->uptime) - { - int num_days, num_hours, num_min; - char u_date_time[256]; - face->uptime = edje_object_add(face->con->bg_evas); - if (!e_theme_edje_object_set(face->uptime, "base/theme/modules/monitor", "modules/monitor/uptime")) - edje_object_file_set(face->uptime, PACKAGE_DATA_DIR"/monitor.edj", "modules/monitor/uptime"); - sprintf (u_date_time,"uptime: %ld days, %ld:%02ld:%02ld", - s_info.uptime / day, (s_info.uptime % day) / hour, - (s_info.uptime % hour) / minute, s_info.uptime % minute); - edje_object_part_text_set(face->uptime,"uptime",u_date_time); - face->date_check_timer = ecore_timer_add(1, _date_cb_check,face); - _add_sensor(face, face->uptime,face->mon->conf->Horz); - } + { + if (face->uptime) evas_object_del(face->uptime); + + int num_days, num_hours, num_min; + char u_date_time[256]; + face->uptime = edje_object_add(face->con->bg_evas); + if (!e_theme_edje_object_set(face->uptime, "base/theme/modules/monitor", "modules/monitor/uptime")) + edje_object_file_set(face->uptime, PACKAGE_DATA_DIR"/monitor.edj", "modules/monitor/uptime"); + sprintf (u_date_time,"uptime: %ld days, %ld:%02ld:%02ld", + s_info.uptime / day, (s_info.uptime % day) / hour, + (s_info.uptime % hour) / minute, s_info.uptime % minute); + edje_object_part_text_set(face->uptime,"uptime",u_date_time); + face->date_check_timer = ecore_timer_add(1, _date_cb_check,face); + _add_sensor(face, face->uptime,face->mon->conf->Horz); + } + else if (face->uptime) + { + evas_object_del(face->uptime); + face->uptime = NULL; + } + if (face->mon->conf->time) - { - time_t now; - struct tm date; - time(&now); - char curr_time[12]; - - date = *localtime(&now); - face->time = edje_object_add(face->con->bg_evas); - if (!e_theme_edje_object_set(face->time, "base/theme/modules/monitor", "modules/monitor/time")) - edje_object_file_set(face->time, PACKAGE_DATA_DIR"/monitor.edj", "modules/monitor/time"); - _add_sensor(face, face->time,face->mon->conf->Horz); - sprintf (curr_time,"%02d:%02d:%02d",date.tm_hour,date.tm_min,date.tm_sec); - edje_object_part_text_set(face->time,"time",curr_time); - } + { + if (face->uptime) evas_object_del(face->uptime); + + time_t now; + struct tm date; + time(&now); + char curr_time[12]; + + date = *localtime(&now); + face->time = edje_object_add(face->con->bg_evas); + if (!e_theme_edje_object_set(face->time, "base/theme/modules/monitor", "modules/monitor/time")) + edje_object_file_set(face->time, PACKAGE_DATA_DIR"/monitor.edj", "modules/monitor/time"); + _add_sensor(face, face->time,face->mon->conf->Horz); + sprintf (curr_time,"%02d:%02d:%02d",date.tm_hour,date.tm_min,date.tm_sec); + edje_object_part_text_set(face->time,"time",curr_time); + } + else if (face->uptime) + { + evas_object_del(face->uptime); + face->time = NULL; + } + if (face->monitor_cover_obj) evas_object_del(face->monitor_cover_obj); + face->monitor_cover_obj = evas_object_rectangle_add(face->con->bg_evas); evas_object_color_set(face->monitor_cover_obj, 255,255,255,0); evas_object_event_callback_add(face->monitor_cover_obj, EVAS_CALLBACK_MOUSE_DOWN, _monitor_face_cb_mouse_down, face); evas_object_show(face->monitor_cover_obj); - /* setup gadman */ + int x, y, w, h; + e_gadman_client_geometry_get(face->gmc, &x, &y, &w, &h); + + evas_object_move(face->monitor_object, x, y); + evas_object_resize(face->monitor_object, w, h); + + evas_object_move(face->table_object, x, y); + evas_object_resize(face->table_object, w, h); + + evas_object_move(face->monitor_cover_obj, x, y); + evas_object_resize(face->monitor_cover_obj, w, h); + + if (face->cpu) evas_object_geometry_get(face->cpu, &x, &y, &w, &h); + if (face->cpu) chart_container_move(face->chart_cpu, x+2,y+2); + if (face->cpu) chart_container_resize(face->chart_cpu, w-4,h-4); + + if (face->mem) evas_object_geometry_get(face->mem, &x, &y, &w, &h); + if (face->mem) chart_container_move(face->chart_mem, x+2,y+2); + if (face->mem) chart_container_resize(face->chart_mem, w-4,h-4); + + if (face->net) evas_object_geometry_get(face->net, &x, &y, &w, &h); + if (face->net) chart_container_move(face->chart_net, x+2,y+2); + if (face->net) chart_container_resize(face->chart_net, w-4,h-4); + + if (face->wlan) evas_object_geometry_get(face->wlan, &x, &y, &w, &h); + if (face->wlan) chart_container_move(face->chart_wlan, x+2,y+2); + if (face->wlan) chart_container_resize(face->chart_wlan, w-4,h-4); + + + /* setup gadman face->gmc = e_gadman_client_new(face->con->gadman); e_gadman_client_domain_set(face->gmc, "module.monitor", _monitor_count++); e_gadman_client_policy_set(face->gmc, @@ -1057,7 +1133,7 @@ e_gadman_client_resize(face->gmc, 160, 40); e_gadman_client_change_func_set(face->gmc, _monitor_face_cb_gmc_change, face); e_gadman_client_load(face->gmc); - + */ evas_event_thaw(face->con->bg_evas); } =================================================================== RCS file: /cvsroot/enlightenment/e_modules/monitor/e_mod_config.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- e_mod_config.c 22 Jan 2006 14:16:08 -0000 1.7 +++ e_mod_config.c 24 Jan 2006 21:35:37 -0000 1.8 @@ -63,8 +63,9 @@ _fill_data(Monitor_Face *f, E_Config_Dialog_Data *cfdata) { char *tmp; - int i = 0; + int i; + i = 0; cfdata->net_interface = f->conf->net_interface; cfdata->wlan_interface = f->conf->wlan_interface; |
From: <enl...@li...> - 2006-01-30 01:11:22
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : monitor Dir : e_modules/monitor/po Log Message: Directory /cvsroot/enlightenment/e_modules/monitor/po added to the repository |
From: <enl...@li...> - 2006-01-30 01:11:51
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : monitor Dir : e_modules/monitor/po Added Files: Makefile.am ja.po Log Message: Add start of intl support for config dialogs. |
From: <enl...@li...> - 2006-01-30 01:12:22
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : monitor Dir : e_modules/monitor Modified Files: Makefile.am autogen.sh configure.in e_mod_config.c e_mod_main.c e_mod_main.h Log Message: Add start of intl support for config dialogs. =================================================================== RCS file: /cvsroot/enlightenment/e_modules/monitor/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- Makefile.am 25 Jan 2006 04:17:15 -0000 1.3 +++ Makefile.am 30 Jan 2006 01:11:45 -0000 1.4 @@ -1,3 +1,5 @@ +SUBDIRS = po + MAINTAINERCLEANFILES = Makefile.in EDJE_CC = @edje_cc@ =================================================================== RCS file: /cvsroot/enlightenment/e_modules/monitor/autogen.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- autogen.sh 12 Dec 2005 05:09:41 -0000 1.1 +++ autogen.sh 30 Jan 2006 01:11:45 -0000 1.2 @@ -10,6 +10,18 @@ echo "Running autoconf..." ; autoconf || exit 1 echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1 echo "Running automake..." ; automake --add-missing --copy --gnu || exit 1 +echo "Generating gettext monitor.pot template"; \ +xgettext \ +--output monitor.pot \ +--output-dir=po \ +--language=C \ +--add-location \ +--keyword=D_ \ +--indent \ +--sort-by-file \ +--copyright-holder="TODO" \ +--foreign-user \ +`find . -name "*.[ch]" -print` || exit 1 if [ -z "$NOCONFIGURE" ]; then ./configure "$@" =================================================================== RCS file: /cvsroot/enlightenment/e_modules/monitor/configure.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- configure.in 21 Jan 2006 00:36:01 -0000 1.2 +++ configure.in 30 Jan 2006 01:11:45 -0000 1.3 @@ -17,6 +17,12 @@ AM_ENABLE_SHARED AM_PROG_LIBTOOL +ALL_LINGUAS="ja" +AC_SUBST(ALL_LINGUAS) + +AM_GNU_GETTEXT([external]) +AM_GNU_GETTEXT_VERSION(0.14) + MODULE_ARCH="$host_os-$host_cpu" AC_SUBST(MODULE_ARCH) AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture") @@ -84,6 +90,16 @@ datadir="${prefix}/lib/enlightenment/modules/${PACKAGE}" fi +AC_PREFIX_DEFAULT(${HOME}/.e/e) +if test "x$prefix" = "xNONE"; then + datarootdir=${ac_default_prefix} +else + datarootdir=${ac_default_prefix}/share +fi +localedir=${datarootdir}/locale +AC_SUBST(LOCALEDIR, "${localedir}") +AC_DEFINE_UNQUOTED(LOCALEDIR, "${localedir}", [Module Locale Directory]) + #AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl) #AC_SUBST(dlopen_libs) @@ -189,6 +205,7 @@ AC_OUTPUT([ Makefile e_modules-monitor.spec +po/Makefile ],[ ]) =================================================================== RCS file: /cvsroot/enlightenment/e_modules/monitor/e_mod_config.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- e_mod_config.c 24 Jan 2006 21:35:37 -0000 1.8 +++ e_mod_config.c 30 Jan 2006 01:11:45 -0000 1.9 @@ -56,7 +56,7 @@ v->advanced.apply_cfdata = _advanced_apply_data; v->advanced.create_widgets = _advanced_create_widgets; - cfd = e_config_dialog_new(con, _("Monitor Configuration"), NULL, 0, v, f); + cfd = e_config_dialog_new(con, D_("Monitor Configuration"), NULL, 0, v, f); } static void @@ -128,25 +128,25 @@ mon = f->mon; o = e_widget_list_add(evas, 0, 0); - of = e_widget_framelist_add(evas, _("Select Sensors"), 0); - ob1 = e_widget_check_add(evas, _("CPU"), &(mon->conf->cpu)); + of = e_widget_framelist_add(evas, D_("Select Sensors"), 0); + ob1 = e_widget_check_add(evas, D_("CPU"), &(mon->conf->cpu)); e_widget_framelist_object_append(of, ob1); - ob2 = e_widget_check_add(evas, _("Memory"), &(mon->conf->mem)); + ob2 = e_widget_check_add(evas, D_("Memory"), &(mon->conf->mem)); e_widget_framelist_object_append(of, ob2); - ob3 = e_widget_check_add(evas, _("Network"), &(mon->conf->net)); + ob3 = e_widget_check_add(evas, D_("Network"), &(mon->conf->net)); e_widget_framelist_object_append(of, ob3); - ob4 = e_widget_check_add(evas, _("WLAN"), &(mon->conf->wlan)); + ob4 = e_widget_check_add(evas, D_("WLAN"), &(mon->conf->wlan)); e_widget_framelist_object_append(of, ob4); - ob5 = e_widget_check_add(evas, _("Hostname"), &(mon->conf->hostname)); + ob5 = e_widget_check_add(evas, D_("Hostname"), &(mon->conf->hostname)); e_widget_framelist_object_append(of, ob5); - ob6 = e_widget_check_add(evas, _("Uptime"), &(mon->conf->uptime)); + ob6 = e_widget_check_add(evas, D_("Uptime"), &(mon->conf->uptime)); e_widget_framelist_object_append(of, ob6); - ob7 = e_widget_check_add(evas, _("time"), &(mon->conf->time)); + ob7 = e_widget_check_add(evas, D_("time"), &(mon->conf->time)); e_widget_framelist_object_append(of, ob7); e_widget_list_object_append(o, of, 1, 1, 0.5); - of = e_widget_framelist_add(evas, _("Monitor"), 0); - ob = e_widget_check_add(evas, _("Horizontal"), &(mon->conf->Horz)); + of = e_widget_framelist_add(evas, D_("Monitor"), 0); + ob = e_widget_check_add(evas, D_("Horizontal"), &(mon->conf->Horz)); e_widget_framelist_object_append(of, ob); e_widget_list_object_append(o, of, 1, 1, 0.5); @@ -175,18 +175,18 @@ f = cfd->data; o = e_widget_list_add(evas, 0, 0); - of = e_widget_framelist_add(evas, _("Cpu"), 0); + of = e_widget_framelist_add(evas, D_("CPU"), 0); ob = e_widget_label_add(evas, _("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, &(f->conf->cpu_interval), NULL, 150); e_widget_framelist_object_append(of, ob); e_widget_list_object_append(o, of, 1, 1, 0.5); - of = e_widget_framelist_add(evas, _("Memory"), 0); + of = e_widget_framelist_add(evas, D_("Memory"), 0); ot = e_widget_table_add(evas, 0); - ob = e_widget_check_add(evas, _("Ignore Cached"), &(f->conf->mem_real_ignore_cached)); + ob = e_widget_check_add(evas, D_("Ignore Cached"), &(f->conf->mem_real_ignore_cached)); e_widget_table_object_append(ot, ob, 0, 0, 1, 1, 1, 0, 1, 0); - ob = e_widget_check_add(evas, _("Ignore Buffers"), &(f->conf->mem_real_ignore_buffers)); + ob = e_widget_check_add(evas, D_("Ignore Buffers"), &(f->conf->mem_real_ignore_buffers)); e_widget_table_object_append(ot, ob, 0, 1, 1, 1, 1, 0, 1, 0); ob = e_widget_label_add(evas, _("Check Interval")); e_widget_table_object_append(ot, ob, 0, 2, 1, 1, 1, 0, 1, 0); @@ -198,7 +198,7 @@ i = 0; if (wlan_interface_count > 0) { - of = e_widget_framelist_add(evas, _("Wireless"), 0); + of = e_widget_framelist_add(evas, D_("Wireless"), 0); ot = e_widget_table_add(evas, 0); rg = e_widget_radio_group_new(&(wlan_interface_number)); ecore_list_goto_first(wlan_interfaces); @@ -221,7 +221,7 @@ i = 0; if (net_interface_count > 0) { - of = e_widget_framelist_add(evas, _("Network"), 0); + of = e_widget_framelist_add(evas, D_("Network"), 0); ot = e_widget_table_add(evas, 0); rg = e_widget_radio_group_new(&(net_interface_number)); ecore_list_goto_first(net_interfaces); =================================================================== RCS file: /cvsroot/enlightenment/e_modules/monitor/e_mod_main.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- e_mod_main.c 24 Jan 2006 21:35:37 -0000 1.15 +++ e_mod_main.c 30 Jan 2006 01:11:45 -0000 1.16 @@ -54,6 +54,10 @@ e_modapi_init(E_Module *module) { Monitor *monitor; + + /* Set up module's message catalogue */ + bindtextdomain(PACKAGE, LOCALEDIR); + bind_textdomain_codeset(PACKAGE, "UTF-8"); /* actually init buttons */ monitor = _monitor_new(); @@ -96,8 +100,8 @@ EAPI int e_modapi_about(E_Module *module) { - e_module_dialog_show(_("Enlightenment Monitor Module"), - _("A simple module to give E17 a usage monitor for some resources.")); + e_module_dialog_show(D_("Enlightenment Monitor Module"), + D_("A simple module to give E17 a usage monitor for some resources.")); return 1; } =================================================================== RCS file: /cvsroot/enlightenment/e_modules/monitor/e_mod_main.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- e_mod_main.h 15 Jan 2006 08:05:09 -0000 1.8 +++ e_mod_main.h 30 Jan 2006 01:11:45 -0000 1.9 @@ -1,3 +1,5 @@ +#define D_(str) dgettext(PACKAGE, str) + #ifndef E_MOD_MAIN_H #define E_MOD_MAIN_H |
From: <enl...@li...> - 2006-02-12 21:38:34
|
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : monitor Dir : e_modules/monitor Modified Files: configure.in Log Message: Fix configure.in bug/typo. Thanks Gerald =================================================================== RCS file: /cvsroot/enlightenment/e_modules/monitor/configure.in,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- configure.in 7 Feb 2006 12:54:46 -0000 1.6 +++ configure.in 12 Feb 2006 21:38:28 -0000 1.7 @@ -94,7 +94,7 @@ if test "x$prefix" = "xNONE"; then datarootdir=${ac_default_prefix} else - datarootdir=${ac_default_prefix}/share + datarootdir=${prefix}/share fi localedir=${datarootdir}/locale AC_SUBST(LOCALEDIR, "${localedir}") |