- possible configure the xscreensaver options only if activated

- now used Eina_List for storage (I hope I used it correct...)


SVN revision: 39952
This commit is contained in:
Andreas Volz 2009-04-10 22:34:15 +00:00
parent 9b12de4e79
commit dd2e62448b
1 changed files with 73 additions and 4 deletions

View File

@ -16,6 +16,8 @@ static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas,
static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas,
E_Config_Dialog_Data *cfdata);
static void _cb_disable_check(void *data, Evas_Object *obj);
static void _cb_disable_check_list(void *data, Evas_Object *obj);
struct _E_Config_Dialog_Data
{
@ -28,6 +30,9 @@ struct _E_Config_Dialog_Data
int exposures;
};
Eina_List *xscreensaver_list;
EAPI E_Config_Dialog *
e_int_config_screensaver(E_Container *con, const char *params __UNUSED__)
{
@ -76,6 +81,15 @@ _create_data(E_Config_Dialog *cfd)
static void
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
Eina_List *l = NULL;
Evas_Object *o = NULL;
// delete the list
for (l = xscreensaver_list; l; l = eina_list_next(l))
{
xscreensaver_list = eina_list_remove_list(xscreensaver_list, l);
}
if (!cfdata) return;
E_FREE(cfdata);
}
@ -107,10 +121,11 @@ static Evas_Object *
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{
Evas_Object *o, *of, *ob;
Evas_Object *xscreensaver_check;
o = e_widget_list_add(evas, 0, 0);
ob = e_widget_check_add(evas, _("Enable X screensaver"), &(cfdata->enable_screensaver));
e_widget_list_object_append(o, ob, 1, 1, 0);
xscreensaver_check = e_widget_check_add(evas, _("Enable X screensaver"), &(cfdata->enable_screensaver));
e_widget_list_object_append(o, xscreensaver_check, 1, 1, 0);
of = e_widget_framelist_add(evas, _("Screensaver Timer(s)"), 0);
@ -118,7 +133,11 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
e_widget_framelist_object_append(of, ob);
ob = e_widget_slider_add(evas, 1, 0, _("%1.0f minutes"), 1.0, 90.0, 1.0, 0,
&(cfdata->timeout), NULL, 100);
e_widget_disabled_set(ob, !cfdata->enable_screensaver); // set state from saved config
e_widget_framelist_object_append(of, ob);
// handler for enable/disable widget
e_widget_on_change_hook_set(xscreensaver_check, _cb_disable_check, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
return o;
@ -138,11 +157,12 @@ static Evas_Object *
_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{
Evas_Object *o, *of, *ob;
Evas_Object *xscreensaver_check;
E_Radio_Group *rg;
o = e_widget_list_add(evas, 0, 0);
ob = e_widget_check_add(evas, _("Enable X screensaver"), &(cfdata->enable_screensaver));
e_widget_list_object_append(o, ob, 1, 1, 0);
xscreensaver_check = e_widget_check_add(evas, _("Enable X screensaver"), &(cfdata->enable_screensaver));
e_widget_list_object_append(o, xscreensaver_check, 1, 1, 0);
of = e_widget_framelist_add(evas, _("Screensaver Timer(s)"), 0);
@ -150,34 +170,83 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
e_widget_framelist_object_append(of, ob);
ob = e_widget_slider_add(evas, 1, 0, _("%1.0f minutes"),
1.0, 90.0, 1.0, 0, &(cfdata->timeout), NULL, 200);
xscreensaver_list = eina_list_append (xscreensaver_list, ob);
e_widget_disabled_set(ob, !cfdata->enable_screensaver); // set state from saved config
e_widget_framelist_object_append(of, ob);
ob = e_widget_label_add(evas, _("Time until X screensaver alternates"));
e_widget_framelist_object_append(of, ob);
ob = e_widget_slider_add(evas, 1, 0, _("%1.0f seconds"),
1.0, 300.0, 1.0, 0, &(cfdata->interval), NULL, 200);
xscreensaver_list = eina_list_append (xscreensaver_list, ob);
e_widget_disabled_set(ob, !cfdata->enable_screensaver); // set state from saved config
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
of = e_widget_framelist_add(evas, _("Blanking"), 0);
rg = e_widget_radio_group_new(&(cfdata->blanking));
ob = e_widget_radio_add(evas, _("Default"), E_CONFIG_BLANKING_DEFAULT, rg);
e_widget_disabled_set(ob, !cfdata->enable_screensaver); // set state from saved config
xscreensaver_list = eina_list_append (xscreensaver_list, ob);
e_widget_framelist_object_append(of, ob);
ob = e_widget_radio_add(evas, _("Preferred"), E_CONFIG_BLANKING_PREFERRED, rg);
e_widget_disabled_set(ob, !cfdata->enable_screensaver); // set state from saved config
xscreensaver_list = eina_list_append (xscreensaver_list, ob);
e_widget_framelist_object_append(of, ob);
ob = e_widget_radio_add(evas, _("Not Preferred"), E_CONFIG_BLANKING_NOT_PREFERRED, rg);
e_widget_disabled_set(ob, !cfdata->enable_screensaver); // set state from saved config
xscreensaver_list = eina_list_append (xscreensaver_list, ob);
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
of = e_widget_framelist_add(evas, _("Exposure Events"), 0);
rg = e_widget_radio_group_new(&(cfdata->exposures));
ob = e_widget_radio_add(evas, _("Default"), E_CONFIG_EXPOSURES_DEFAULT, rg);
e_widget_disabled_set(ob, !cfdata->enable_screensaver); // set state from saved config
xscreensaver_list = eina_list_append (xscreensaver_list, ob);
e_widget_framelist_object_append(of, ob);
ob = e_widget_radio_add(evas, _("Allow"), E_CONFIG_EXPOSURES_ALLOWED, rg);
e_widget_disabled_set(ob, !cfdata->enable_screensaver); // set state from saved config
xscreensaver_list = eina_list_append (xscreensaver_list, ob);
e_widget_framelist_object_append(of, ob);
ob = e_widget_radio_add(evas, _("Don't Allow"), E_CONFIG_EXPOSURES_NOT_ALLOWED, rg);
e_widget_disabled_set(ob, !cfdata->enable_screensaver); // set state from saved config
xscreensaver_list = eina_list_append (xscreensaver_list, ob);
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
// handler for enable/disable widget array
e_widget_on_change_hook_set(xscreensaver_check, _cb_disable_check_list, xscreensaver_list);
return o;
}
/*!
* @param data A Evas_Object to chain together with the checkbox
* @param obj A Evas_Object checkbox created with e_widget_check_add()
*/
static void
_cb_disable_check(void *data, Evas_Object *obj)
{
e_widget_disabled_set((Evas_Object *) data,
!e_widget_check_checked_get(obj));
}
/*!
* @param data A Eina_List of Evas_Object to chain widgets together with the checkbox
* @param obj A Evas_Object checkbox created with e_widget_check_add()
*/
static void
_cb_disable_check_list(void *data, Evas_Object *obj)
{
Eina_List *list = (Eina_List*) data;
Eina_List *l = NULL;
Evas_Object *o = NULL;
for (l = list, o = eina_list_data_get(l); l; l = eina_list_next(l),
o = eina_list_data_get(l))
{
e_widget_disabled_set(o, !e_widget_check_checked_get(obj));
}
}