Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : uptime
Dir : e_modules/uptime
Modified Files:
e_mod_config.c e_mod_main.c uptime.edc
Log Message:
Changed edc to make the text more like tclock. Looks better imho.
Fixed uptime using >80% cpu when poll interval was 1 second. Thanks raster
for the idea :)
===================================================================
RCS file: /cvs/e/e_modules/uptime/e_mod_config.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_mod_config.c 14 Jun 2006 00:36:14 -0000 1.6
+++ e_mod_config.c 14 Jun 2006 01:03:32 -0000 1.7
@@ -69,7 +69,7 @@
of = e_widget_framelist_add(evas, D_("Uptime Settings"), 0);
ob = e_widget_label_add(evas, D_("Check Interval:"));
e_widget_framelist_object_append(of, ob);
- ob = e_widget_slider_add(evas, 1, 0, _("%1.0f minutes"), 1.0, 10.0, 1.0, 0,
&(cfdata->check_interval), NULL, 100);
+ ob = e_widget_slider_add(evas, 1, 0, _("%1.0f seconds"), 1.0, 60.0, 1.0, 0,
&(cfdata->check_interval), NULL, 100);
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
@@ -82,7 +82,7 @@
Config_Item *ci;
ci = cfd->data;
- ci->check_interval = (cfdata->check_interval * 60.0);
+ ci->check_interval = cfdata->check_interval;
e_config_save_queue();
_ut_config_updated(ci->id);
===================================================================
RCS file: /cvs/e/e_modules/uptime/e_mod_main.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_mod_main.c 9 Jun 2006 11:42:59 -0000 1.9
+++ e_mod_main.c 14 Jun 2006 01:03:32 -0000 1.10
@@ -11,6 +11,7 @@
Evas_Object *ut_obj;
Uptime *ut;
Ecore_Timer *monitor;
+ int uptime;
};
struct _Uptime
@@ -53,6 +54,7 @@
Config_Item *ci;
Uptime *ut;
char buf[4096];
+ struct sysinfo s_info;
inst = E_NEW(Instance, 1);
ci = _ut_config_item_get(id);
@@ -71,6 +73,9 @@
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
_ut_cb_mouse_down, inst);
ut_config->instances = evas_list_append(ut_config->instances, inst);
+ sysinfo(&s_info);
+ inst->uptime = s_info.uptime;
+
if (!inst->monitor)
inst->monitor = ecore_timer_add(ci->check_interval, _ut_cb_check, inst);
@@ -349,18 +354,22 @@
_ut_cb_check(void *data)
{
Instance *inst;
- char u_date_time[256];
- struct sysinfo s_info;
+ Config_Item *ci;
long minute = 60;
long hour = minute * 60;
long day = hour * 24;
+ char u_date_time[256];
inst = data;
if (!inst) return 0;
- sysinfo(&s_info);
+ ci = _ut_config_item_get(inst->gcc->id);
+ if (!ci) return 0;
+
+ inst->uptime += (1 * ci->check_interval);
+
sprintf(u_date_time, D_("uptime: %ld days, %ld:%02ld:%02ld"),
- s_info.uptime / day, (s_info.uptime % day) / hour, (s_info.uptime %
hour) / minute, s_info.uptime % minute);
+ inst->uptime / day, (inst->uptime % day) / hour, (inst->uptime %
hour) / minute, inst->uptime % minute);
edje_object_part_text_set(inst->ut->ut_obj, "uptime", u_date_time);
return 1;
===================================================================
RCS file: /cvs/e/e_modules/uptime/uptime.edc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- uptime.edc 14 Jun 2006 00:12:06 -0000 1.7
+++ uptime.edc 14 Jun 2006 01:03:32 -0000 1.8
@@ -35,8 +35,8 @@
offset: -1 -1;
}
color: 255 255 255 255;
- color2: 64 64 64 255;
- color3: 128 128 128 192;
+ color2: 0 0 0 96;
+ color3: 0 0 0 32;
text
{
text: "uptime";
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
