E CVS: monitor nasa01
Enlightenment CVS committal
Author : nasa01
Project : e_modules
Module : monitor
Dir : e_modules/monitor
Modified Files:
monitor.edc
Log Message:
Guess you need this update file to see things...
===
RCS file: /cvsroot/enlightenment/e_modules/monitor/monitor.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- monitor.edc 12 Dec 2005 05:09:41 - 1.1
+++ monitor.edc 29 Dec 2005 01:48:09 - 1.2
@@ -176,11 +176,11 @@
align, 1.0 0.0;
rel1 { relative, 1.0 0.0; to_x, "overlay"; offset, -2 1; }
rel2 { relative, 1.0 0.0; }
- color, 255 255 255 255;
- color3, 0 0 0 100;
+ color, 5 5 5 255;
+ color3, 255 255 255 100;
text {
text, "test"; font, "VeraMono";
- size, 8; min, 1 1;
+ size, 10; min, 1 1;
align, 1.0 0.0;
}
}
@@ -249,7 +249,7 @@
color3, 0 0 0 100;
text {
text, "memory-real"; font, "VeraMono";
- size, 8; min, 1 1;
+ size, 10; min, 1 1;
align, 1.0 0.0;
}
}
@@ -339,7 +339,7 @@
color3, 0 0 0 100;
text {
text, "net-out"; font, "VeraMono";
- size, 8; min, 1 1;
+ size, 10; min, 1 1;
align, 1.0 0.0;
}
}
@@ -361,7 +361,7 @@
color3, 0 0 0 100;
text {
text, "net-in"; font, "VeraMono";
- size, 8; min, 1 1;
+ size, 10; min, 1 1;
align, 1.0 0.0;
}
}
@@ -423,7 +423,7 @@
color3, 0 0 0 100;
text {
text, "test"; font, "VeraMono";
- size, 8;
+ size, 10;
min, 1 1;
align, 1.0 0.0;
}
@@ -432,5 +432,179 @@
}
}//close group wlan
+group {
+ name, "monitor/host";
+ parts {
+ part {
+ name, "overlay";
+ mouse_events, 0;
+ description {
+ state,"default" 0.0;
+ rel1 { offset, 1 1; }
+ rel2 { offset, -2 -2; }
+ image {
+ normal, "over_res.png";
+ border, 2 2 2 2;
+ middle, 0;
+ }
+ fill { smooth, 0; }
+ color, 255 255 255 64;
+ }
+ description {
+ state,"active" 0.0;
+ inherit, "default" 0.0;
+ color, 255 255 255 255;
+ }
+ }
+ part {
+ name, "sysname";
+ type, TEXT;
+ effect, SOFT_SHADOW;
+ mouse_events, 0;
+ description {
+ state, "default" 0.0;
+ rel1 { relative, 0.0 0.0; }
+ rel2 { relative, 1.0 0.5; }
+ color, 255 255 255 255;
+ color3, 0 0 0 100;
+ text {
+ text, "test"; font, "VeraMono";
+ size, 12;
+ min, 1 1;
+ align, 0.5 0.5;
+ }
+ }
+ }
+ part {
+ name, "release";
+ type, TEXT;
+ effect, SOFT_SHADOW;
+ mouse_events, 0;
+ description {
+ state, "default" 0.0;
+ rel1 { relative, 0.0 0.5; }
+ rel2 { relative, 0.8 1.0; }
+ color, 255 255 255 255;
+ color3, 0 0 0 100;
+ text {
+ text, "test"; font, "VeraMono";
+ size, 10;
+
E CVS: monitor nasa01
Enlightenment CVS committal Author : nasa01 Project : e_modules Module : monitor Dir : e_modules/monitor Modified Files: e_mod_main.c Log Message: Fixing small bug, adding couple of sensors === RCS file: /cvsroot/enlightenment/e_modules/monitor/e_mod_main.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- e_mod_main.c28 Dec 2005 16:47:12 - 1.5 +++ e_mod_main.c28 Dec 2005 16:51:31 - 1.6 @@ -465,7 +465,7 @@ face->uptime = edje_object_add(con->bg_evas); edje_object_file_set(face->uptime, PACKAGE_DATA_DIR"/monitor.edj", "monitor/uptime"); _add_sensor(face, face->uptime,config->Horz); - sprintf (u_date_time,"uptime: %ld days, %ld:%02ld:%02ld\n", + 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); @@ -979,7 +979,7 @@ 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"); - sprintf (u_date_time,"uptime: %ld days, %ld:%02ld:%02ld\n", + 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); @@ -1040,7 +1040,7 @@ long day = hour * 24; double megabyte = 1024 * 1024; - sprintf (u_date_time,"uptime: %ld days, %ld:%02ld:%02ld\n", + 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); --- 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
E CVS: monitor nasa01
Enlightenment CVS committal
Author : nasa01
Project : e_modules
Module : monitor
Dir : e_modules/monitor
Modified Files:
e_mod_config.c e_mod_main.c e_mod_main.h
Log Message:
Fixing small bug, adding couple of sensors
===
RCS file: /cvsroot/enlightenment/e_modules/monitor/e_mod_config.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_mod_config.c 24 Dec 2005 02:31:46 - 1.3
+++ e_mod_config.c 28 Dec 2005 16:47:12 - 1.4
@@ -117,7 +117,7 @@
static Evas_Object
*_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data)
{
- Evas_Object *o, *of, *ob, *ob1, *ob2, *ob3, *ob4, *ot;
+ Evas_Object *o, *of, *ob, *ob1, *ob2, *ob3, *ob4, *ob5, *ob6, *ob7,*ot;
E_Radio_Group *rg;
CFData *cfdata;
cfdata = data;
@@ -140,6 +140,12 @@
e_widget_framelist_object_append(of, ob3);
ob4 = e_widget_check_add(evas, _("WLAN"), &(mon->conf->wlan));
e_widget_framelist_object_append(of, ob4);
+ ob5 = e_widget_check_add(evas, _("Hostname"), &(mon->conf->hostname));
+ e_widget_framelist_object_append(of, ob5);
+ ob6 = e_widget_check_add(evas, _("Uptime"), &(mon->conf->uptime));
+ e_widget_framelist_object_append(of, ob6);
+ ob7 = e_widget_check_add(evas, _("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);
===
RCS file: /cvsroot/enlightenment/e_modules/monitor/e_mod_main.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_mod_main.c24 Dec 2005 02:31:46 - 1.4
+++ e_mod_main.c28 Dec 2005 16:47:12 - 1.5
@@ -1,4 +1,10 @@
#include "e_mod_main.h"
+#include
+#include
+#include /* for _syscallX macros/related stuff */
+#include /* for struct sysinfo */
+
+
/* module private routines */
@@ -23,6 +29,7 @@
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 void _add_sensor(Monitor_Face *face, Evas_Object *o, int VerHor);
+static int _date_cb_check(void *data);
static int _monitor_count;
static int num_sensors;
@@ -180,16 +187,22 @@
E_CONFIG_VAL(D, T, net, INT);
E_CONFIG_VAL(D, T, wlan, INT);
E_CONFIG_VAL(D, T, Horz, INT);
+ E_CONFIG_VAL(D, T, hostname, INT);
+ E_CONFIG_VAL(D, T, uptime, INT);
+ E_CONFIG_VAL(D, T, time, INT);
monitor->conf = e_config_domain_load("module.monitor", conf_edd);
if (!monitor->conf)
{
monitor->conf = E_NEW(Config, 1);
- monitor->conf->cpu = 1;
- monitor->conf->mem = 1;
- monitor->conf->net = 1;
- monitor->conf->wlan = 1;
+ monitor->conf->cpu = 0;
+ monitor->conf->mem = 0;
+ monitor->conf->net = 0;
+ monitor->conf->wlan = 0;
monitor->conf->Horz = 0;
+ monitor->conf->hostname = 1;
+ monitor->conf->uptime = 1;
+ monitor->conf->time = 0;
}
_monitor_config_menu_new(monitor);
@@ -223,7 +236,7 @@
else
{
face->conf = cl->data;
- if (face->conf->config_version != MONITOR_CONFIG_VERSION)
+/* if (face->conf->config_version !=
MONITOR_CONFIG_VERSION)
{
face->conf = E_NEW(Config_Face, 1);
face->conf = _monitor_face_config_init(face->conf);
@@ -231,7 +244,7 @@
_("Configuration data needed
upgrading. Your old configuration\n"
"has been removed. Please reset
your setting for the monitor\n"
"module. Sorry for the
inconvenience.\n"));
- }
+ } */
cl = cl->next;
}
@@ -305,7 +318,17 @@
{
Monitor_Face *face;
Evas_Object *o;
+ struct utsname u_buf;
+ char u_date_time[256];
+ struct sysinfo s_info;
+ sysinfo (&s_info);
+
+ long minute = 60;
+ long hour = minute * 60;
+ long day = hour * 24;
+ double megabyte = 1024 * 1024;
+ uname (&u_buf);
/*
* Configuration cannot be used yet as the face config
* is not initialized. Everything will be updated after
@@ -337,6 +360,19 @@
e_table_homogenous_set(o, 1);
edje_object_part_swallow(face->monitor_object, "items", face->table_object);
evas_object_show(o);
+
+ /*setup hostname sensor*/
+ if (config->hostname)
+ {
+ face->hostname = edje_object_add(con->bg_evas);
+ edje_object_file_set(face->hostname, PACKAGE_DATA_DIR"/monitor.edj",
"monitor/host");
+ _add_sensor(face,face->hostname,confi
E CVS: monitor nasa01
Enlightenment CVS committal
Author : nasa01
Project : e_modules
Module : monitor
Dir : e_modules/monitor
Modified Files:
e_mod_config.c e_mod_main.c e_mod_main.h flow_chart.c
flow_chart.h
Log Message:
minor improvements - add vertical option, ability to turn on/off sensors
===
RCS file: /cvsroot/enlightenment/e_modules/monitor/e_mod_config.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_mod_config.c 20 Dec 2005 19:35:36 - 1.2
+++ e_mod_config.c 24 Dec 2005 02:31:46 - 1.3
@@ -35,10 +35,12 @@
};
/* Protos */
-static void *_create_data(E_Config_Dialog *cfd);
-static void _free_data(E_Config_Dialog *cfd, CFData *cfdata);
-static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas,
CFData *cfdata);
-static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
+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);
void
_config_monitor_module(E_Container *con, Monitor_Face *f)
@@ -50,8 +52,8 @@
v.free_cfdata = _free_data;
v.basic.apply_cfdata = _basic_apply_data;
v.basic.create_widgets = _basic_create_widgets;
- v.advanced.apply_cfdata = NULL;
- v.advanced.create_widgets = NULL;
+ 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);
}
@@ -61,15 +63,7 @@
{
char *tmp;
int i = 0;
-
- cfdata->cpu_interval = f->conf->cpu_interval;
- cfdata->mem_interval = f->conf->mem_interval;
- cfdata->net_interval = f->conf->net_interval;
- cfdata->wlan_interval = f->conf->wlan_interval;
- cfdata->net_interface = f->conf->net_interface;
- cfdata->wlan_interface = f->conf->wlan_interface;
- cfdata->mem_real_ignore_cached = f->conf->mem_real_ignore_cached;
- cfdata->mem_real_ignore_buffers = f->conf->mem_real_ignore_buffers;
+
cfdata->net_interface = f->conf->net_interface;
cfdata->wlan_interface = f->conf->wlan_interface;
@@ -113,40 +107,89 @@
}
static void
-_free_data(E_Config_Dialog *cfd, CFData *cfdata)
+_free_data(E_Config_Dialog *cfd, void *data)
{
+ CFData *cfdata;
+ cfdata = data;
free(cfdata);
}
static Evas_Object
-*_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
+*_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data)
{
- Evas_Object *o, *of, *ob, *ot;
+ Evas_Object *o, *of, *ob, *ob1, *ob2, *ob3, *ob4, *ot;
E_Radio_Group *rg;
+ CFData *cfdata;
+ cfdata = data;
char *tmp;
int i;
Monitor_Face *f;
+ Monitor *mon;
+
f = cfd->data;
- _fill_data(f, cfdata);
+ 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));
+ e_widget_framelist_object_append(of, ob1);
+ ob2 = e_widget_check_add(evas, _("Memory"), &(mon->conf->mem));
+ e_widget_framelist_object_append(of, ob2);
+ ob3 = e_widget_check_add(evas, _("Network"), &(mon->conf->net));
+ e_widget_framelist_object_append(of, ob3);
+ ob4 = e_widget_check_add(evas, _("WLAN"), &(mon->conf->wlan));
+ e_widget_framelist_object_append(of, ob4);
+ 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));
+ e_widget_framelist_object_append(of, ob);
+ e_widget_list_object_append(o, of, 1, 1, 0.5);
+
+ return o;
+}
+
+static int
+_basic_apply_data(E_Config_Dialog *cfd, void *data)
+{
+ 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)
+{
+ Evas_Object *o, *of, *ob, *ot;
+ E_Radio_Group *rg;
+ CFData *cfdata;
+ cfdata = data;
+ char *tmp;
+ int i;
+ Monitor_Face *f;
+
+ f = cfd->data;
+
+ o = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, _("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,
&(cfdata->cpu_interval), NULL, 150);
+ 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
