Enlightenment CVS committal
Author : rephorm
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/battery
Modified Files:
e_mod_main.c
Log Message:
****** MAJOR THEME REWORKING -- BREAKAGE *********
Almost every signal and required part name has changed. This means that ALL
themes other than the default one are now broken. Sorry, but this had to happen.
I have a list of mappings from old to new at
http://rephorm.com/files/dump/e_theme_map.txt
There will probably be a little more cleanup on this in the coming days. Then
I'll write it all up in a nice theme spec.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/battery/e_mod_main.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -3 -r1.86 -r1.87
--- e_mod_main.c 19 Aug 2006 09:07:33 -0000 1.86
+++ e_mod_main.c 22 Aug 2006 07:39:11 -0000 1.87
@@ -275,17 +275,17 @@
if (ret->state == BATTERY_STATE_CHARGING)
{
if (battery_config->battery_prev_ac != 1)
- edje_object_signal_emit(inst->o_battery, "charge", "");
- edje_object_signal_emit(inst->o_battery, "pulsestop",
"");
- edje_object_part_text_set(inst->o_battery, "reading",
ret->reading);
- edje_object_part_text_set(inst->o_battery, "time",
ret->time);
+ edje_object_signal_emit(inst->o_battery,
"e,state,charging", "e");
+ edje_object_signal_emit(inst->o_battery,
"e,action,pulse,stop", "e");
+ edje_object_part_text_set(inst->o_battery,
"e.text.reading", ret->reading);
+ edje_object_part_text_set(inst->o_battery,
"e.text.time", ret->time);
_battery_face_level_set(inst, ret->level);
battery_config->battery_prev_ac = 1;
}
else if (ret->state == BATTERY_STATE_DISCHARGING)
{
if (battery_config->battery_prev_ac != 0)
- edje_object_signal_emit(inst->o_battery, "discharge",
"");
+ edje_object_signal_emit(inst->o_battery,
"e,state,discharging", "e");
if (ret->alarm)
{
if (!battery_config->alarm_triggered)
@@ -304,10 +304,10 @@
e_win_centered_set(dia->win, 1);
e_dialog_show(dia);
}
- edje_object_signal_emit(inst->o_battery, "pulse",
"");
+ edje_object_signal_emit(inst->o_battery,
"e,action,pulse,start", "e");
}
- edje_object_part_text_set(inst->o_battery, "reading",
ret->reading);
- edje_object_part_text_set(inst->o_battery, "time",
ret->time);
+ edje_object_part_text_set(inst->o_battery,
"e.text.reading", ret->reading);
+ edje_object_part_text_set(inst->o_battery,
"e.text.time", ret->time);
_battery_face_level_set(inst, ret->level);
battery_config->battery_prev_ac = 0;
if (ret->alarm)
@@ -317,11 +317,11 @@
{
/* ret->state == BATTERY_STATE_NONE */
if (battery_config->battery_prev_ac != 1)
- edje_object_signal_emit(inst->o_battery, "charge", "");
+ edje_object_signal_emit(inst->o_battery,
"e,state,charging", "e");
if (battery_config->battery_prev_battery == 0)
- edje_object_signal_emit(inst->o_battery, "charge", "");
- edje_object_part_text_set(inst->o_battery, "reading",
ret->reading);
- edje_object_part_text_set(inst->o_battery, "time",
ret->time);
+ edje_object_signal_emit(inst->o_battery,
"e,state,charging", "e");
+ edje_object_part_text_set(inst->o_battery,
"e.text.reading", ret->reading);
+ edje_object_part_text_set(inst->o_battery,
"e.text.time", ret->time);
_battery_face_level_set(inst, ret->level);
battery_config->battery_prev_ac = 1;
battery_config->battery_prev_battery = 1;
@@ -331,9 +331,9 @@
{
/* Hasn't battery */
if (battery_config->battery_prev_battery != 0)
- edje_object_signal_emit(inst->o_battery, "unknown", "");
- edje_object_part_text_set(inst->o_battery, "reading",
ret->reading);
- edje_object_part_text_set(inst->o_battery, "time", ret->time);
+ edje_object_signal_emit(inst->o_battery, "e,state,unknown",
"e");
+ edje_object_part_text_set(inst->o_battery, "e.text.reading",
ret->reading);
+ edje_object_part_text_set(inst->o_battery, "e.text.time",
ret->time);
_battery_face_level_set(inst, ret->level);
battery_config->battery_prev_battery = 0;
}
@@ -342,9 +342,9 @@
{
/* Error reading status */
if (battery_config->battery_prev_battery != -2)
- edje_object_signal_emit(inst->o_battery, "unknown", "");
- edje_object_part_text_set(inst->o_battery, "reading", _("NO
INFO"));
- edje_object_part_text_set(inst->o_battery, "time", "--:--");
+ edje_object_signal_emit(inst->o_battery, "e,state,unknown", "e");
+ edje_object_part_text_set(inst->o_battery, "e.text.reading", _("NO
INFO"));
+ edje_object_part_text_set(inst->o_battery, "e.text.time", "--:--");
_battery_face_level_set(inst, (double)(rand() & 0xff) / 255.0);
battery_config->battery_prev_battery = -2;
battery_config->battery_check_mode = CHECK_NONE;
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
