vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

usability improvement 

-> warp mouse setting in advanced dialog is not complete consistent, but better as before...


SVN revision: 40060
This commit is contained in:
Andreas Volz 2009-04-14 21:31:49 +00:00
parent ebdee6b204
commit 543f71218f
1 changed files with 89 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
src/modules/conf_winlist/e_int_config_winlist.c
View File

@ -6,6 +6,9 @@ static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data
static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
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_enable_check(void *data, Evas_Object *obj);
static void _cb_disable_check_list(void *data, Evas_Object *obj);
struct _E_Config_Dialog_Data
{
@ -35,6 +38,10 @@ struct _E_Config_Dialog_Data
int pos_max_h;
};
Eina_List *iconified_list = NULL;
Eina_List *warp_at_end_list = NULL;
Eina_List *scroll_animation_list = NULL;
EAPI E_Config_Dialog *
e_int_config_winlist(E_Container *con, const char *params __UNUSED__)
{
@ -98,6 +105,10 @@ _create_data(E_Config_Dialog *cfd)
static void
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
iconified_list = eina_list_free(iconified_list);
warp_at_end_list = eina_list_free(warp_at_end_list);
scroll_animation_list = eina_list_free(scroll_animation_list);
E_FREE(cfdata);
}
@ -125,16 +136,24 @@ static Evas_Object *
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{
Evas_Object *o, *of, *ob;
Evas_Object *iconified_check;
Evas_Object *warp_mouse_check;
o = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, _("General Settings"), 0);
ob = e_widget_check_add(evas, _("Show iconified windows"), &(cfdata->list_show_iconified));
e_widget_framelist_object_append(of, ob);
iconified_check = e_widget_check_add(evas, _("Show iconified windows"), &(cfdata->list_show_iconified));
e_widget_framelist_object_append(of, iconified_check);
ob = e_widget_check_add(evas, _("Show iconified windows from other desks"), &(cfdata->list_show_other_desk_iconified));
iconified_list = eina_list_append (iconified_list, ob);
e_widget_disabled_set(ob, !cfdata->list_show_iconified); // set state from saved config
e_widget_framelist_object_append(of, ob);
ob = e_widget_check_add(evas, _("Show iconified windows from other screens"), &(cfdata->list_show_other_screen_iconified));
e_widget_framelist_object_append(of, ob);
iconified_list = eina_list_append (iconified_list, ob);
e_widget_disabled_set(ob, !cfdata->list_show_iconified); // set state from saved config
e_widget_framelist_object_append(of, ob);
// handler for enable/disable widget array
e_widget_on_change_hook_set(iconified_check, _cb_disable_check_list, iconified_list);
ob = e_widget_check_add(evas, _("Show windows from other desks"), &(cfdata->list_show_other_desk_windows));
e_widget_framelist_object_append(of, ob);
ob = e_widget_check_add(evas, _("Show windows from other screens"), &(cfdata->list_show_other_screen_windows));
@ -146,8 +165,8 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
e_widget_framelist_object_append(of, ob);
ob = e_widget_check_add(evas, _("Raise window while selecting"), &(cfdata->list_raise_while_selecting));
e_widget_framelist_object_append(of, ob);
ob = e_widget_check_add(evas, _("Warp mouse to window while selecting"), &(cfdata->warp_while_selecting));
e_widget_framelist_object_append(of, ob);
warp_mouse_check = e_widget_check_add(evas, _("Warp mouse to window while selecting"), &(cfdata->warp_while_selecting));
e_widget_framelist_object_append(of, warp_mouse_check);
ob = e_widget_check_add(evas, _("Uncover windows while selecting"), &(cfdata->list_uncover_while_selecting));
e_widget_framelist_object_append(of, ob);
ob = e_widget_check_add(evas, _("Jump to desk while selecting"), &(cfdata->list_jump_desk_while_selecting));
@ -156,6 +175,8 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
of = e_widget_framelist_add(evas, _("Warp Settings"), 0);
ob = e_widget_check_add(evas, _("Warp At End"), &(cfdata->warp_at_end));
e_widget_disabled_set(ob, cfdata->warp_while_selecting); // set state from saved config
e_widget_on_change_hook_set(warp_mouse_check, _cb_enable_check, ob);
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
@ -199,6 +220,8 @@ static Evas_Object *
_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{
Evas_Object *o, *of, *ob, *ot;
Evas_Object *warp_at_end_check;
Evas_Object *scroll_animation_check;
o = e_widget_list_add(evas, 0, 0);
ot = e_widget_table_add(evas, 0);
@ -229,23 +252,35 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
e_widget_table_object_append(ot, of, 0, 0, 1, 1, 1, 1, 1, 1);
of = e_widget_framelist_add(evas, _("Warp Settings"), 0);
ob = e_widget_check_add(evas, _("Warp At End"), &(cfdata->warp_at_end));
e_widget_framelist_object_append(of, ob);
warp_at_end_check = e_widget_check_add(evas, _("Warp At End"), &(cfdata->warp_at_end));
e_widget_framelist_object_append(of, warp_at_end_check);
ob = e_widget_label_add(evas, _("Warp Speed"));
warp_at_end_list = eina_list_append (warp_at_end_list, ob);
e_widget_disabled_set(ob, !cfdata->warp_at_end); // set state from saved config
e_widget_framelist_object_append(of, ob);
ob = e_widget_slider_add(evas, 1, 0, _("%1.2f"), 0.0, 1.0, 0.01, 0, &(cfdata->warp_speed), NULL, 200);
warp_at_end_list = eina_list_append (warp_at_end_list, ob);
e_widget_disabled_set(ob, !cfdata->warp_at_end); // set state from saved config
e_widget_framelist_object_append(of, ob);
e_widget_table_object_append(ot, of, 0, 1, 1, 1, 1, 1, 1, 1);
// handler for enable/disable widget array
e_widget_on_change_hook_set(warp_at_end_check, _cb_disable_check_list, warp_at_end_list);
of = e_widget_framelist_add(evas, _("Scroll Settings"), 0);
ob = e_widget_check_add(evas, _("Scroll Animate"), &(cfdata->scroll_animate));
e_widget_framelist_object_append(of, ob);
scroll_animation_check = e_widget_check_add(evas, _("Scroll Animate"), &(cfdata->scroll_animate));
e_widget_framelist_object_append(of, scroll_animation_check);
ob = e_widget_label_add(evas, _("Scroll Speed"));
scroll_animation_list = eina_list_append (scroll_animation_list , ob);
e_widget_disabled_set(ob, !cfdata->scroll_animate); // set state from saved config
e_widget_framelist_object_append(of, ob);
ob = e_widget_slider_add(evas, 1, 0, _("%1.2f"), 0.0, 1.0, 0.01, 0, &(cfdata->scroll_speed), NULL, 200);
e_widget_framelist_object_append(of, ob);
scroll_animation_list = eina_list_append (scroll_animation_list , ob);
e_widget_disabled_set(ob, !cfdata->scroll_animate); // set state from saved config
e_widget_framelist_object_append(of, ob);
e_widget_table_object_append(ot, of, 0, 2, 1, 1, 1, 1, 1, 1);
// handler for enable/disable widget array
e_widget_on_change_hook_set(scroll_animation_check, _cb_disable_check_list, scroll_animation_list);
of = e_widget_framelist_add(evas, _("Position Settings"), 0);
ob = e_widget_label_add(evas, _("X-Axis Alignment"));
e_widget_framelist_object_append(of, ob);
@ -279,3 +314,46 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
e_widget_list_object_append(o, ot, 1, 1, 0.5);
return o;
}
/*!
* If the check is disabled then disable the chained object.
*
* @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));
}
/*!
* If the check is disabled then enable the chained object.
*
* @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_enable_check(void *data, Evas_Object *obj)
{
e_widget_disabled_set((Evas_Object *) data,
e_widget_check_checked_get(obj));
}
/*!
* * If the check is disabled then disable the chained objects in the list.
*
* @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;
Evas_Object *o;
EINA_LIST_FOREACH(list, l, o)
e_widget_disabled_set(o, !e_widget_check_checked_get(obj));
}