Enlightenment CVS committal
Author : handyande
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/battery
Modified Files:
e_mod_config.c e_mod_main.c e_mod_main.h
Log Message:
Move the manipulation of user specified policy flags (ALLOW_OVERLAP and
ALWAYS_ON_TOP (not used yet)) to the gadman edit menu, saves a LOT of code
inside modules
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/battery/e_mod_config.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- e_mod_config.c 13 Feb 2006 15:39:32 -0000 1.14
+++ e_mod_config.c 12 Mar 2006 16:12:56 -0000 1.15
@@ -10,7 +10,6 @@
int show_alert;
double poll_time;
int alarm_time;
- int allow_overlap;
};
struct _Cfg_File_Data
@@ -55,7 +54,6 @@
cfdata->show_alert = 1;
else
cfdata->show_alert = 0;
- cfdata->allow_overlap = b->conf->allow_overlap;
}
static void *
@@ -90,11 +88,6 @@
ob = e_widget_check_add(evas, _("Show alert when battery is low"),
&(cfdata->show_alert));
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
-
- of = e_widget_framelist_add(evas, _("Extras"), 0);
- ob = e_widget_check_add(evas, _("Allow windows to overlap this gadget"),
&(cfdata->allow_overlap));
- e_widget_framelist_object_append(of, ob);
- e_widget_list_object_append(o, of, 1, 1, 0.5);
return o;
}
@@ -107,11 +100,6 @@
e_border_button_bindings_ungrab_all();
b->conf->poll_time = 10.0;
- if (cfdata->allow_overlap && !b->conf->allow_overlap)
- b->conf->allow_overlap = 1;
- else if (!cfdata->allow_overlap && b->conf->allow_overlap)
- b->conf->allow_overlap = 0;
-
e_border_button_bindings_grab_all();
e_config_save_queue();
@@ -144,11 +132,6 @@
e_widget_frametable_object_append(of, ob, 0, 5, 1, 1, 1, 0, 1, 0);
e_widget_list_object_append(o, of, 1, 1, 0.5);
-
- of = e_widget_framelist_add(evas, _("Extras"), 0);
- ob = e_widget_check_add(evas, _("Allow windows to overlap this gadget"),
&(cfdata->allow_overlap));
- e_widget_framelist_object_append(of, ob);
- e_widget_list_object_append(o, of, 1, 1, 0.5);
return o;
}
@@ -166,11 +149,6 @@
else
b->conf->alarm = 0;
- if (cfdata->allow_overlap && !b->conf->allow_overlap)
- b->conf->allow_overlap = 1;
- else if (!cfdata->allow_overlap && b->conf->allow_overlap)
- b->conf->allow_overlap = 0;
-
e_border_button_bindings_grab_all();
e_config_save_queue();
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/battery/e_mod_main.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -3 -r1.69 -r1.70
--- e_mod_main.c 4 Mar 2006 12:36:42 -0000 1.69
+++ e_mod_main.c 12 Mar 2006 16:12:56 -0000 1.70
@@ -64,8 +64,6 @@
static void _battery_face_cb_menu_configure(void *data, E_Menu *m,
E_Menu_Item *mi);
-static void _battery_face_cb_update_policy(void *data);
-
static E_Config_DD *conf_edd;
static E_Config_DD *conf_face_edd;
@@ -191,7 +189,6 @@
#define D conf_edd
E_CONFIG_VAL(D, T, poll_time, DOUBLE);
E_CONFIG_VAL(D, T, alarm, INT);
- E_CONFIG_VAL(D, T, allow_overlap, INT);
E_CONFIG_LIST(D, T, faces, conf_face_edd);
e->conf = e_config_domain_load("module.battery", conf_edd);
@@ -200,11 +197,9 @@
e->conf = E_NEW(Config, 1);
e->conf->poll_time = 30.0;
e->conf->alarm = 30;
- e->conf->allow_overlap = 0;
}
E_CONFIG_LIMIT(e->conf->poll_time, 0.5, 1000.0);
E_CONFIG_LIMIT(e->conf->alarm, 0, 60);
- E_CONFIG_LIMIT(e->conf->allow_overlap, 0, 1);
_battery_config_menu_new(e);
@@ -340,10 +335,6 @@
E_GADMAN_POLICY_VMOVE |
E_GADMAN_POLICY_HSIZE |
E_GADMAN_POLICY_VSIZE;
- if (bat->conf->allow_overlap == 0)
- policy &= ~E_GADMAN_POLICY_ALLOW_OVERLAP;
- else
- policy |= E_GADMAN_POLICY_ALLOW_OVERLAP;
e_gadman_client_policy_set(ef->gmc, policy);
e_gadman_client_min_size_set(ef->gmc, 4, 4);
e_gadman_client_max_size_set(ef->gmc, 128, 128);
@@ -1645,31 +1636,8 @@
void
_battery_face_cb_config_updated(Battery *bat)
{
- /* Call all functions needed to update battery */
- _battery_face_cb_update_policy((void*)bat);
-
/* Update Poll Time */
ecore_timer_del(bat->battery_check_timer);
bat->battery_check_timer = ecore_timer_add(bat->conf->poll_time,
_battery_cb_check, bat);
}
-static void _battery_face_cb_update_policy(void *data)
-{
- Battery *bat;
- Battery_Face *bf;
- Evas_List *l;
- E_Gadman_Policy policy;
-
- bat = data;
- for (l = bat->faces; l; l = l->next)
- {
- bf = l->data;
- policy = bf->gmc->policy;
-
- if (bat->conf->allow_overlap ==0)
- policy &= ~E_GADMAN_POLICY_ALLOW_OVERLAP;
- else
- policy |= E_GADMAN_POLICY_ALLOW_OVERLAP;
- e_gadman_client_policy_set(bf->gmc , policy);
- }
-}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/battery/e_mod_main.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- e_mod_main.h 20 Jan 2006 04:04:12 -0000 1.19
+++ e_mod_main.h 12 Mar 2006 16:12:56 -0000 1.20
@@ -20,7 +20,6 @@
{
double poll_time;
int alarm;
- int allow_overlap;
Evas_List *faces;
};
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
