Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/battery
Modified Files:
e_mod_config.c
Log Message:
Updated Battery Config Dialogue. Opinions ?
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/battery/e_mod_config.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_mod_config.c 15 Dec 2005 02:59:05 -0000 1.2
+++ e_mod_config.c 16 Dec 2005 05:21:12 -0000 1.3
@@ -7,10 +7,9 @@
struct _cfdata
{
- double poll_time;
+ int show_alert;
+ double poll_time;
int alarm_time;
- int poll_method;
- int alarm_method;
};
struct _Cfg_File_Data
@@ -51,48 +50,16 @@
static void
_fill_data(CFData *cfdata)
{
- double p;
- int a;
-
- /* Fill Data */
- p = b->conf->poll_time;
- cfdata->poll_time = p;
- if ((p >= 1) && (p <= 5))
- {
- cfdata->poll_method = 1; //Fast
- }
- else if ((p > 5) && (p <= 10))
- {
- cfdata->poll_method = 10; //Normal
- }
- else if ((p > 10) && (p <= 30))
- {
- cfdata->poll_method = 30; //Slow
- }
- else if (p > 30)
- {
- cfdata->poll_method = 60; // Very Slow
- }
-
- a = b->conf->alarm;
- cfdata->alarm_time = a;
- if (a == 0)
- {
- cfdata->alarm_method = 0; //Disable
- }
- else if (a <=10)
- {
- cfdata->alarm_method = 10; // 10 mins
- }
- else if (a <=30)
+ cfdata->alarm_time = b->conf->alarm;
+ cfdata->poll_time = b->conf->poll_time;
+ if (cfdata->alarm_time > 0)
{
- cfdata->alarm_method = 30; // 10 mins
+ cfdata->show_alert = 1;
}
- else if (a <=60)
+ else
{
- cfdata->alarm_method = 60; // 10 mins
+ cfdata->show_alert = 0;
}
-
}
static void
@@ -113,35 +80,13 @@
*_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
{
Evas_Object *o, *of, *ob;
- E_Radio_Group *rg;
_fill_data(cfdata);
o = e_widget_list_add(evas, 0, 0);
- of = e_widget_framelist_add(evas, _("Poll Time"), 0);
- rg = e_widget_radio_group_new(&(cfdata->poll_method));
- ob = e_widget_radio_add(evas, _("Fast"), 1, rg);
- e_widget_framelist_object_append(of, ob);
- ob = e_widget_radio_add(evas, _("Normal"), 10, rg);
- e_widget_framelist_object_append(of, ob);
- ob = e_widget_radio_add(evas, _("Slow"), 30, rg);
- e_widget_framelist_object_append(of, ob);
- ob = e_widget_radio_add(evas, _("Very Slow"), 60, rg);
- e_widget_framelist_object_append(of, ob);
- e_widget_list_object_append(o, of, 1, 1, 0.5);
-
- of = e_widget_framelist_add(evas, _("Alarm Time"), 0);
- rg = e_widget_radio_group_new(&(cfdata->alarm_method));
-
- ob = e_widget_radio_add(evas, _("Disable"), 0, rg);
+ of = e_widget_framelist_add(evas, _("Basic Settings"), 0);
+ ob = e_widget_check_add(evas, _("Show alert when battery is low"),
&(cfdata->show_alert));
e_widget_framelist_object_append(of, ob);
- ob = e_widget_radio_add(evas, _("10 Mins"), 10, rg);
- e_widget_framelist_object_append(of, ob);
- ob = e_widget_radio_add(evas, _("30 Mins"), 30, rg);
- e_widget_framelist_object_append(of, ob);
- ob = e_widget_radio_add(evas, _("1 Hour"), 60, rg);
- e_widget_framelist_object_append(of, ob);
-
e_widget_list_object_append(o, of, 1, 1, 0.5);
return o;
}
@@ -150,10 +95,7 @@
_basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
{
e_border_button_bindings_ungrab_all();
-
- b->conf->poll_time = (double)cfdata->poll_method;
- b->conf->alarm = cfdata->alarm_method;
-
+ b->conf->poll_time = 10.0;
e_border_button_bindings_grab_all();
e_config_save_queue();
@@ -164,22 +106,29 @@
static Evas_Object
*_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
{
- Evas_Object *o, *of, *ob;
- E_Radio_Group *rg;
+ Evas_Object *o, *of, *ob, *ot;
/* Use Sliders for both cfg options */
_fill_data(cfdata);
o = e_widget_list_add(evas, 0, 0);
- of = e_widget_framelist_add(evas, _("Poll Time"), 0);
+ of = e_widget_frametable_add(evas, _("Advanced Settings"), 1);
+
+ ob = e_widget_label_add(evas, _("Check battery every:"));
+ e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 0, 1, 0);
+
ob = e_widget_slider_add(evas, 1, 0, _("%1.1f seconds"), 0.5, 1000.0, 0.5,
0, &(cfdata->poll_time), NULL, 200);
- e_widget_framelist_object_append(of, ob);
- e_widget_list_object_append(o, of, 1, 1, 0.5);
-
- of = e_widget_framelist_add(evas, _("Alarm Time"), 0);
- ob = e_widget_slider_add(evas, 1, 0, _("%1.0f minutes"), 0, 60, 1, 0, NULL,
&(cfdata->alarm_time), 200);
- e_widget_framelist_object_append(of, ob);
+ e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 0, 1, 0);
+
+ ob = e_widget_check_add(evas, _("Show alert when battery is low"),
&(cfdata->show_alert));
+ e_widget_frametable_object_append(of, ob, 0, 3, 1, 1, 1, 1, 1, 0);
+
+ ob = e_widget_label_add(evas, _("Alert when battery is down to:"));
+ e_widget_frametable_object_append(of, ob, 0, 4, 1, 1, 1, 0, 1, 1);
+ ob = e_widget_slider_add(evas, 1, 0, _("%1.0f minutes"), 1, 60, 1, 0, NULL,
&(cfdata->alarm_time), 200);
+ 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);
return o;
}
@@ -190,7 +139,14 @@
e_border_button_bindings_ungrab_all();
b->conf->poll_time = cfdata->poll_time;
- b->conf->alarm = cfdata->alarm_time;
+ if (cfdata->show_alert)
+ {
+ b->conf->alarm = cfdata->alarm_time;
+ }
+ else
+ {
+ b->conf->alarm = 0;
+ }
e_border_button_bindings_grab_all();
e_config_save_queue();
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
