Diff is of e17/apps/e
Changelog:
- Updated to new themeing system
- Fixed up some code to be more efficient
- Added myself, although insignificant, to the AUTHORS file
Index: AUTHORS
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/AUTHORS,v
retrieving revision 1.8
diff -r1.8 AUTHORS
2a3
> Mekius_ (Nick Hughart) <[EMAIL PROTECTED]>
Index: data/themes/default_battery.edc
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_battery.edc,v
retrieving revision 1.1
diff -r1.1 default_battery.edc
30a31
> clip_to: "pulse_clip";
208a210,226
> part {
> name: "pulse_clip";
> type: RECT;
> mouse_events: 0;
> description {
> state: "default" 0.0;
> color: 255 255 255 255;
> }
> description {
> state: "faded" 1.0;
> color: 255 255 255 255;
> }
> description {
> state: "faded" 0.0;
> color: 255 255 255 0;
> }
> }
245a264,287
> program {
> name: "pulse";
> signal: "pulse";
> source: "";
> action: STATE_SET "faded" 0.0;
> transition: ACCELERATE 0.3;
> after: "pulse2";
> target: "pulse_clip";
> }
> program {
> name: "pulse2";
> signal: "pulse2";
> source: "";
> action: STATE_SET "faded" 1.0;
> transition: ACCELERATE 0.1;
> target: "pulse_clip";
> }
> program {
> name: "pulsestop";
> signal: "pulsestop";
> source: "";
> action: STATE_SET "default" 0.0;
> target: "pulse_clip";
> }
247c289
< }
\ No newline at end of file
---
> }
Index: src/modules/battery/e_mod_main.c
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/battery/e_mod_main.c,v
retrieving revision 1.8
diff -r1.8 e_mod_main.c
60a61,62
> _battery_config_menu_del(e, e->config_menu_alarm);
> _battery_config_menu_del(e, e->config_menu_poll);
119a122
> E_CONFIG_VAL(D, T, alarm, INT);
128c131,132
< e->conf->poll_time = 30.0;
---
> e->conf->poll_time = 30.0;
> e->conf->alarm = 30;
133a138
> E_CONFIG_LIMIT(e->conf->alarm, 0, 60);
171a177,239
> _battery_menu_alarm_10(void *data, E_Menu *m, E_Menu_Item *mi)
> {
> Battery *e;
>
> e = data;
> e->conf->alarm = 10;
> }
>
> static void
> _battery_menu_alarm_20(void *data, E_Menu *m, E_Menu_Item *mi)
> {
> Battery *e;
>
> e = data;
> e->conf->alarm = 20;
> }
>
> static void
> _battery_menu_alarm_30(void *data, E_Menu *m, E_Menu_Item *mi)
> {
> Battery *e;
>
> e = data;
> e->conf->alarm = 30;
> }
>
> static void
> _battery_menu_alarm_40(void *data, E_Menu *m, E_Menu_Item *mi)
> {
> Battery *e;
>
> e = data;
> e->conf->alarm = 40;
> }
>
> static void
> _battery_menu_alarm_50(void *data, E_Menu *m, E_Menu_Item *mi)
> {
> Battery *e;
>
> e = data;
> e->conf->alarm = 50;
> }
>
> static void
> _battery_menu_alarm_60(void *data, E_Menu *m, E_Menu_Item *mi)
> {
> Battery *e;
>
> e = data;
> e->conf->alarm = 60;
> }
>
> static void
> _battery_menu_alarm_disable(void *data, E_Menu *m, E_Menu_Item *mi)
> {
> Battery *e;
>
> e = data;
> e->conf->alarm = 0;
> }
>
> static void
239a308,360
> e_menu_item_label_set(mi, "Disable");
> e_menu_item_radio_set(mi, 1);
> e_menu_item_radio_group_set(mi, 1);
> if (e->conf->alarm == 0) e_menu_item_toggle_set(mi, 1);
> e_menu_item_callback_set(mi, _battery_menu_alarm_disable, e);
>
> mi = e_menu_item_new(mn);
> e_menu_item_label_set(mi, "10 mins");
> e_menu_item_radio_set(mi, 1);
> e_menu_item_radio_group_set(mi, 1);
> if (e->conf->alarm == 10) e_menu_item_toggle_set(mi, 1);
> e_menu_item_callback_set(mi, _battery_menu_alarm_10, e);
>
> mi = e_menu_item_new(mn);
> e_menu_item_label_set(mi, "20 mins");
> e_menu_item_radio_set(mi, 1);
> e_menu_item_radio_group_set(mi, 1);
> if (e->conf->alarm == 20) e_menu_item_toggle_set(mi, 1);
> e_menu_item_callback_set(mi, _battery_menu_alarm_20, e);
>
> mi = e_menu_item_new(mn);
> e_menu_item_label_set(mi, "30 mins");
> e_menu_item_radio_set(mi, 1);
> e_menu_item_radio_group_set(mi, 1);
> if (e->conf->alarm == 30) e_menu_item_toggle_set(mi, 1);
> e_menu_item_callback_set(mi, _battery_menu_alarm_30, e);
>
> mi = e_menu_item_new(mn);
> e_menu_item_label_set(mi, "40 mins");
> e_menu_item_radio_set(mi, 1);
> e_menu_item_radio_group_set(mi, 1);
> if (e->conf->alarm == 40) e_menu_item_toggle_set(mi, 1);
> e_menu_item_callback_set(mi, _battery_menu_alarm_40, e);
>
> mi = e_menu_item_new(mn);
> e_menu_item_label_set(mi, "50 mins");
> e_menu_item_radio_set(mi, 1);
> e_menu_item_radio_group_set(mi, 1);
> if (e->conf->alarm == 50) e_menu_item_toggle_set(mi, 1);
> e_menu_item_callback_set(mi, _battery_menu_alarm_50, e);
>
> mi = e_menu_item_new(mn);
> e_menu_item_label_set(mi, "1 hour");
> e_menu_item_radio_set(mi, 1);
> e_menu_item_radio_group_set(mi, 1);
> if (e->conf->alarm == 60) e_menu_item_toggle_set(mi, 1);
> e_menu_item_callback_set(mi, _battery_menu_alarm_60, e);
>
> e->config_menu_alarm = mn;
>
> mn = e_menu_new();
>
> mi = e_menu_item_new(mn);
273a395,406
> e->config_menu_poll = mn;
>
> mn = e_menu_new();
>
> mi = e_menu_item_new(mn);
> e_menu_item_label_set(mi, "Set Poll Time");
> e_menu_item_submenu_set(mi, e->config_menu_poll);
>
> mi = e_menu_item_new(mn);
> e_menu_item_label_set(mi, "Set Alarm");
> e_menu_item_submenu_set(mi, e->config_menu_alarm);
>
621a755,757
>
> edje_object_signal_emit(ef->bat_object, "pulsestop", "");
> ef->bat->alarm_triggered = 0;
623c759
< else if ((discharging) && (ef->battery_prev_ac != 0))
---
> else if (discharging)
625,626c761,776
< edje_object_signal_emit(ef->bat_object, "discharge", "");
< ef->battery_prev_ac = 0;
---
> if (ef->battery_prev_ac != 0)
> {
> edje_object_signal_emit(ef->bat_object, "discharge", "");
> ef->battery_prev_ac = 0;
> }
> if((hours*60+minutes) <= ef->bat->conf->alarm)
> {
> if( !(ef->bat->alarm_triggered))
> {
> e_error_dialog_show("Battery Running Low",
> "Your battery is running low.\n"
> "You may wish to switch to an AC source.");
> }
> edje_object_signal_emit(ef->bat_object, "pulse", "");
> ef->bat->alarm_triggered = 1;
> }
648c798
< }
---
> }
768c918,935
< }
---
>
> if( (hours*60+minutes) <= ef->bat->conf->alarm)
> {
> if( !(ef->bat->alarm_triggered))
> {
> e_error_dialog_show("Battery Running Low",
> "Your battery is running low.\n"
> "You may wish to switch to an AC source.");
> }
> edje_object_signal_emit(ef->bat_object, "pulse", "");
> ef->bat->alarm_triggered = 1;
> }
> else
> {
> edje_object_signal_emit(ef->bat_object, "pulsestop", "");
> ef->bat->alarm_triggered = 0;
> }
> }
Index: src/modules/battery/e_mod_main.h
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/battery/e_mod_main.h,v
retrieving revision 1.3
diff -r1.3 e_mod_main.h
16a17
> int alarm;
21a23,24
> E_Menu *config_menu_alarm;
> E_Menu *config_menu_poll;
25a29
> int alarm_triggered;
