Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/battery
Modified Files:
e_mod_main.c e_mod_main.h
Log Message:
Add main menu to face menu.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/battery/e_mod_main.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- e_mod_main.c 10 Feb 2005 12:44:10 -0000 1.16
+++ e_mod_main.c 10 Feb 2005 16:42:07 -0000 1.17
@@ -186,15 +186,13 @@
_battery_face_menu_new(ef);
/* Add main menu to face menu */
- /*
- for (ml = e->menus; ml; ml = ml->next)
- {
- mn = ml->data;
- mi = e_menu_item_new(ef->menu);
- e_menu_item_label_set(mi, "????");
- e_menu_item_submenu_set(mi, mn);
- }
- */
+ mi = e_menu_item_new(ef->menu);
+ e_menu_item_label_set(mi, "Set Poll Time");
+ e_menu_item_submenu_set(mi, e->config_menu_poll);
+
+ mi = e_menu_item_new(ef->menu);
+ e_menu_item_label_set(mi, "Set Alarm");
+ e_menu_item_submenu_set(mi, e->config_menu_alarm);
mi = e_menu_item_new(e->config_menu);
e_menu_item_label_set(mi, con->name);
@@ -224,10 +222,9 @@
_battery_face_free(l->data);
evas_list_free(e->faces);
- for (l = e->menus; l; l = l->next)
- e_object_del(E_OBJECT(l->data));
- evas_list_free(e->menus);
e_object_del(E_OBJECT(e->config_menu));
+ e_object_del(E_OBJECT(e->config_menu_poll));
+ e_object_del(E_OBJECT(e->config_menu_alarm));
ecore_timer_del(e->battery_check_timer);
@@ -368,7 +365,7 @@
static void
_battery_config_menu_new(Battery *e)
{
- E_Menu *mn, *config_menu_alarm, *config_menu_poll;
+ E_Menu *mn;
E_Menu_Item *mi;
/* Alarm */
@@ -423,7 +420,7 @@
if (e->conf->alarm == 60) e_menu_item_toggle_set(mi, 1);
e_menu_item_callback_set(mi, _battery_menu_alarm_60, e);
- config_menu_alarm = mn;
+ e->config_menu_alarm = mn;
/* Check interval */
mn = e_menu_new();
@@ -463,21 +460,19 @@
if (e->conf->poll_time == 60.0) e_menu_item_toggle_set(mi, 1);
e_menu_item_callback_set(mi, _battery_menu_very_slow, e);
- config_menu_poll = mn;
+ 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, config_menu_poll);
+ 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, config_menu_alarm);
+ e_menu_item_submenu_set(mi, e->config_menu_alarm);
e->config_menu = mn;
- e->menus = evas_list_append(e->menus, config_menu_poll);
- e->menus = evas_list_append(e->menus, config_menu_alarm);
}
static Battery_Face *
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/battery/e_mod_main.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_mod_main.h 10 Feb 2005 12:00:39 -0000 1.7
+++ e_mod_main.h 10 Feb 2005 16:42:07 -0000 1.8
@@ -30,7 +30,8 @@
struct _Battery
{
E_Menu *config_menu;
- Evas_List *menus;
+ E_Menu *config_menu_poll;
+ E_Menu *config_menu_alarm;
Evas_List *faces;
Config *conf;
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
