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
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
