diff --git a/src/modules/conf_window_display/e_int_config_window_display.c b/src/modules/conf_window_display/e_int_config_window_display.c index 97991c9ef..4e5ecaaab 100644 --- a/src/modules/conf_window_display/e_int_config_window_display.c +++ b/src/modules/conf_window_display/e_int_config_window_display.c @@ -5,24 +5,14 @@ static void *_create_data(E_Config_Dialog *cfd); static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); +static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static int _basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static int _advanced_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); -static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); +static Evas_Object *_basic_create(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 { - /*- BASIC -*/ - int move_resize_info; - int animate_shading; - int window_placement_policy; - int desk_auto_switch; - - /*- ADVANCED -*/ int move_info_visible; int move_info_follows; int resize_info_visible; @@ -31,6 +21,8 @@ struct _E_Config_Dialog_Data int border_shade_transition; double border_shade_speed; int use_app_icon; + int window_placement_policy; + int desk_auto_switch; Eina_List *shading_list; }; @@ -48,16 +40,12 @@ e_int_config_window_display(E_Container *con, const char *params __UNUSED__) /* methods */ v->create_cfdata = _create_data; v->free_cfdata = _free_data; - v->basic.apply_cfdata = _basic_apply_data; - v->basic.create_widgets = _basic_create_widgets; + v->basic.apply_cfdata = _basic_apply; + v->basic.create_widgets = _basic_create; v->basic.check_changed = _basic_check_changed; - v->advanced.apply_cfdata = _advanced_apply_data; - v->advanced.create_widgets = _advanced_create_widgets; - v->advanced.check_changed = _advanced_check_changed; /* create config diaolg for NULL object/data */ - cfd = e_config_dialog_new(con, - _("Window Display"), + cfd = e_config_dialog_new(con, _("Window Display"), "E", "windows/window_display", "preferences-system-windows", 0, v, NULL); return cfd; @@ -66,22 +54,20 @@ e_int_config_window_display(E_Container *con, const char *params __UNUSED__) static void * _create_data(E_Config_Dialog *cfd __UNUSED__) { - E_Config_Dialog_Data *cfdata = E_NEW(E_Config_Dialog_Data, 1); + E_Config_Dialog_Data *cfdata; + + cfdata = E_NEW(E_Config_Dialog_Data, 1); if (!cfdata) return NULL; cfdata->move_info_visible = e_config->move_info_visible; cfdata->move_info_follows = e_config->move_info_follows; cfdata->resize_info_visible = e_config->resize_info_visible; cfdata->resize_info_follows = e_config->resize_info_follows; - - cfdata->move_resize_info = ((e_config->move_info_visible) && - (e_config->resize_info_visible)); - cfdata->use_app_icon = e_config->use_app_icon; - cfdata->window_placement_policy = e_config->window_placement_policy; + cfdata->window_placement_policy = + e_config->window_placement_policy; cfdata->desk_auto_switch = e_config->desk_auto_switch; - cfdata->animate_shading = e_config->border_shade_animate; cfdata->border_shade_animate = e_config->border_shade_animate; cfdata->border_shade_transition = e_config->border_shade_transition; cfdata->border_shade_speed = e_config->border_shade_speed; @@ -97,43 +83,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) } static int -_basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) -{ - if (cfdata->move_resize_info) - { - e_config->move_info_visible = 1; - e_config->resize_info_visible = 1; - cfdata->move_info_visible = 1; - cfdata->resize_info_visible = 1; - } - else - { - e_config->move_info_visible = 0; - e_config->resize_info_visible = 0; - cfdata->move_info_visible = 0; - cfdata->resize_info_visible = 0; - } - e_config->window_placement_policy = cfdata->window_placement_policy; - e_config->border_shade_animate = cfdata->animate_shading; - e_config->desk_auto_switch = cfdata->desk_auto_switch; - e_config_save_queue(); - return 1; -} - -static int -_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) -{ - Eina_Bool old_move_resize_info = ((e_config->move_info_visible) && - (e_config->resize_info_visible)); - - return ((old_move_resize_info != cfdata->move_resize_info) || - (e_config->window_placement_policy != cfdata->window_placement_policy) || - (e_config->border_shade_animate != cfdata->animate_shading) || - (e_config->desk_auto_switch != cfdata->desk_auto_switch)); -} - -static int -_advanced_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) { e_config->window_placement_policy = cfdata->window_placement_policy; e_config->move_info_visible = cfdata->move_info_visible; @@ -151,7 +101,7 @@ _advanced_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda } static int -_advanced_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) +_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) { return ((e_config->window_placement_policy != cfdata->window_placement_policy) || (e_config->move_info_visible != cfdata->move_info_visible) || @@ -166,145 +116,109 @@ _advanced_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *c } static Evas_Object * -_basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) +_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) { - Evas_Object *o, *of, *ob; + Evas_Object *otb, *ol, *of, *ow, *oc; E_Radio_Group *rg; - cfdata->move_resize_info = ((cfdata->move_info_visible) && - (cfdata->resize_info_visible)); - - o = e_widget_list_add(evas, 0, 0); - - of = e_widget_framelist_add(evas, _("Display"), 0); - ob = e_widget_check_add(evas, _("Geometry when moving or resizing"), - &(cfdata->move_resize_info)); - e_widget_framelist_object_append(of, ob); - ob = e_widget_check_add(evas, _("Animated shading"), - &(cfdata->animate_shading)); - e_widget_framelist_object_append(of, ob); - e_widget_list_object_append(o, of, 1, 0, 0.5); - - of = e_widget_framelist_add(evas, _("New Window Placement"), 0); - rg = e_widget_radio_group_new(&(cfdata->window_placement_policy)); - ob = e_widget_radio_add(evas, _("Smart Placement"), - E_WINDOW_PLACEMENT_SMART, rg); - e_widget_framelist_object_append(of, ob); - ob = e_widget_radio_add(evas, _("Don't hide Gadgets"), - E_WINDOW_PLACEMENT_ANTIGADGET, rg); - e_widget_framelist_object_append(of, ob); - ob = e_widget_radio_add(evas, _("Place at mouse pointer"), - E_WINDOW_PLACEMENT_CURSOR, rg); - e_widget_framelist_object_append(of, ob); - ob = e_widget_radio_add(evas, _("Place manually with the mouse"), - E_WINDOW_PLACEMENT_MANUAL, rg); - e_widget_framelist_object_append(of, ob); - ob = e_widget_check_add(evas, _("Switch to desktop of new window"), - &(cfdata->desk_auto_switch)); - e_widget_framelist_object_append(of, ob); - e_widget_list_object_append(o, of, 1, 0, 0.5); - - return o; -} - -static Evas_Object * -_advanced_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata) -{ - Evas_Object *ob, *of, *otb, *ol; - Evas_Object *window_move_check; - Evas_Object *window_resize_check; - Evas_Object *window_shading_check; - E_Radio_Group *rg; - - otb = e_widget_toolbook_add(evas, 48 * e_scale, 48 * e_scale); + otb = e_widget_toolbook_add(evas, (24 * e_scale), (24 * e_scale)); + /* Display */ ol = e_widget_list_add(evas, 0, 0); - of = e_widget_framelist_add(evas, _("Move Geometry"), 0); - e_widget_framelist_content_align_set(of, 0.0, 0.0); - window_move_check = e_widget_check_add(evas, _("Display information"), &(cfdata->move_info_visible)); - e_widget_framelist_object_append(of, window_move_check); - ob = e_widget_check_add(evas, _("Follows the window"), &(cfdata->move_info_follows)); - e_widget_disabled_set(ob, !cfdata->move_info_visible); - e_widget_on_change_hook_set(window_move_check, _cb_disable_check, ob); - e_widget_framelist_object_append(of, ob); + oc = e_widget_check_add(evas, _("Display information"), + &(cfdata->move_info_visible)); + e_widget_framelist_object_append(of, oc); + ow = e_widget_check_add(evas, _("Follows the window"), + &(cfdata->move_info_follows)); + e_widget_disabled_set(ow, !cfdata->move_info_visible); + e_widget_on_change_hook_set(oc, _cb_disable_check, ow); + e_widget_framelist_object_append(of, ow); e_widget_list_object_append(ol, of, 1, 1, 0.5); of = e_widget_framelist_add(evas, _("Resize Geometry"), 0); - window_resize_check = e_widget_check_add(evas, _("Display information"), &(cfdata->resize_info_visible)); - e_widget_framelist_object_append(of, window_resize_check); - ob = e_widget_check_add(evas, _("Follows the window"), &(cfdata->resize_info_follows)); - e_widget_disabled_set(ob, !cfdata->resize_info_visible); - e_widget_on_change_hook_set(window_resize_check, _cb_disable_check, ob); - e_widget_framelist_object_append(of, ob); + oc = e_widget_check_add(evas, _("Display information"), + &(cfdata->resize_info_visible)); + e_widget_framelist_object_append(of, oc); + ow = e_widget_check_add(evas, _("Follows the window"), + &(cfdata->resize_info_follows)); + e_widget_disabled_set(ow, !cfdata->resize_info_visible); + e_widget_on_change_hook_set(oc, _cb_disable_check, ow); + e_widget_framelist_object_append(of, ow); e_widget_list_object_append(ol, of, 1, 1, 0.5); + e_widget_toolbook_page_append(otb, NULL, _("Display"), ol, + 0, 0, 1, 0, 0.5, 0.0); - of = e_widget_framelist_add(evas, _("Border Icon Preference"), 0); + /* Border Icon */ + ol = e_widget_list_add(evas, 0, 0); rg = e_widget_radio_group_new(&(cfdata->use_app_icon)); - ob = e_widget_radio_add(evas, _("User defined"), 0, rg); - e_widget_framelist_object_append(of, ob); - ob = e_widget_radio_add(evas, _("Application provided"), 1, rg); - e_widget_framelist_object_append(of, ob); - e_widget_list_object_append(ol, of, 1, 1, 0.5); - - e_widget_toolbook_page_append - (otb, NULL, _("Display"), ol, 0, 0, 1, 0, 0.5, 0.0); - + ow = e_widget_radio_add(evas, _("User defined"), 0, rg); + e_widget_list_object_append(ol, ow, 1, 1, 0.5); + ow = e_widget_radio_add(evas, _("Application provided"), 1, rg); + e_widget_list_object_append(ol, ow, 1, 1, 0.5); + e_widget_toolbook_page_append(otb, NULL, _("Border Icon"), ol, + 0, 0, 1, 0, 0.5, 0.0); + /* New Windows */ ol = e_widget_list_add(evas, 0, 0); - of = e_widget_framelist_add(evas, _("Placement"), 0); - e_widget_framelist_content_align_set(of, 0.0, 0.0); rg = e_widget_radio_group_new(&(cfdata->window_placement_policy)); - ob = e_widget_radio_add(evas, _("Smart Placement"), E_WINDOW_PLACEMENT_SMART, rg); - e_widget_framelist_object_append(of, ob); - ob = e_widget_radio_add(evas, _("Don't hide Gadgets"), E_WINDOW_PLACEMENT_ANTIGADGET, rg); - e_widget_framelist_object_append(of, ob); - ob = e_widget_radio_add(evas, _("Place at mouse pointer"), E_WINDOW_PLACEMENT_CURSOR, rg); - e_widget_framelist_object_append(of, ob); - ob = e_widget_radio_add(evas, _("Place manually with the mouse"), E_WINDOW_PLACEMENT_MANUAL, rg); - e_widget_framelist_object_append(of, ob); + ow = e_widget_radio_add(evas, _("Smart Placement"), + E_WINDOW_PLACEMENT_SMART, rg); + e_widget_framelist_object_append(of, ow); + ow = e_widget_radio_add(evas, _("Don't hide Gadgets"), + E_WINDOW_PLACEMENT_ANTIGADGET, rg); + e_widget_framelist_object_append(of, ow); + ow = e_widget_radio_add(evas, _("Place at mouse pointer"), + E_WINDOW_PLACEMENT_CURSOR, rg); + e_widget_framelist_object_append(of, ow); + ow = e_widget_radio_add(evas, _("Place manually with the mouse"), + E_WINDOW_PLACEMENT_MANUAL, rg); + e_widget_framelist_object_append(of, ow); e_widget_list_object_append(ol, of, 1, 1, 0.5); + ow = e_widget_check_add(evas, _("Switch to desktop of new window"), + &(cfdata->desk_auto_switch)); + e_widget_list_object_append(ol, ow, 1, 1, 0.5); + e_widget_toolbook_page_append(otb, NULL, _("New Windows"), ol, + 0, 0, 1, 0, 0.5, 0.0); - ob = e_widget_check_add(evas, _("Switch to desktop of new window"), &(cfdata->desk_auto_switch)); - e_widget_list_object_append(ol, ob, 1, 1, 0.5); - - e_widget_toolbook_page_append - (otb, NULL, _("New Windows"), ol, 0, 0, 1, 0, 0.5, 0.0); - + /* Shading */ ol = e_widget_list_add(evas, 0, 0); + oc = e_widget_check_add(evas, _("Animate"), + &(cfdata->border_shade_animate)); + e_widget_list_object_append(ol, oc, 1, 1, 0.5); + ow = e_widget_slider_add(evas, 1, 0, _("%4.0f pixels/sec"), + 100, 9900, 100, 0, + &(cfdata->border_shade_speed), NULL, 100); + e_widget_disabled_set(ow, !cfdata->border_shade_animate); + cfdata->shading_list = eina_list_append(cfdata->shading_list, ow); + e_widget_list_object_append(ol, ow, 1, 1, 0.5); - window_shading_check = e_widget_check_add(evas, _("Animate"), &(cfdata->border_shade_animate)); - e_widget_list_object_append(ol, window_shading_check, 1, 1, 0.5); - ob = e_widget_slider_add(evas, 1, 0, _("%4.0f pixels/sec"), 100, 9900, 100, 0, &(cfdata->border_shade_speed), NULL, 100); - e_widget_disabled_set(ob, !cfdata->border_shade_animate); - e_widget_list_object_append(ol, ob, 1, 1, 0.5); - cfdata->shading_list = eina_list_append(cfdata->shading_list, ob); rg = e_widget_radio_group_new(&(cfdata->border_shade_transition)); - ob = e_widget_radio_add(evas, _("Linear"), E_TRANSITION_LINEAR, rg); - e_widget_disabled_set(ob, !cfdata->border_shade_animate); - cfdata->shading_list = eina_list_append(cfdata->shading_list, ob); - e_widget_list_object_append(ol, ob, 1, 1, 0.5); - ob = e_widget_radio_add(evas, _("Accelerate, then decelerate"), E_TRANSITION_SINUSOIDAL, rg); - e_widget_disabled_set(ob, !cfdata->border_shade_animate); - cfdata->shading_list = eina_list_append(cfdata->shading_list, ob); - e_widget_list_object_append(ol, ob, 1, 1, 0.5); - ob = e_widget_radio_add(evas, _("Accelerate"), E_TRANSITION_ACCELERATE, rg); - e_widget_disabled_set(ob, !cfdata->border_shade_animate); - cfdata->shading_list = eina_list_append(cfdata->shading_list, ob); - e_widget_list_object_append(ol, ob, 1, 1, 0.5); - ob = e_widget_radio_add(evas, _("Decelerate"), E_TRANSITION_DECELERATE, rg); - e_widget_disabled_set(ob, !cfdata->border_shade_animate); - cfdata->shading_list = eina_list_append(cfdata->shading_list, ob); - e_widget_list_object_append(ol, ob, 1, 1, 0.5); + ow = e_widget_radio_add(evas, _("Linear"), E_TRANSITION_LINEAR, rg); + e_widget_disabled_set(ow, !cfdata->border_shade_animate); + cfdata->shading_list = eina_list_append(cfdata->shading_list, ow); + e_widget_list_object_append(ol, ow, 1, 1, 0.5); + ow = e_widget_radio_add(evas, _("Accelerate, then decelerate"), + E_TRANSITION_SINUSOIDAL, rg); + e_widget_disabled_set(ow, !cfdata->border_shade_animate); + cfdata->shading_list = eina_list_append(cfdata->shading_list, ow); + e_widget_list_object_append(ol, ow, 1, 1, 0.5); + ow = e_widget_radio_add(evas, _("Accelerate"), E_TRANSITION_ACCELERATE, rg); + e_widget_disabled_set(ow, !cfdata->border_shade_animate); + cfdata->shading_list = eina_list_append(cfdata->shading_list, ow); + e_widget_list_object_append(ol, ow, 1, 1, 0.5); + ow = e_widget_radio_add(evas, _("Decelerate"), E_TRANSITION_DECELERATE, rg); + e_widget_disabled_set(ow, !cfdata->border_shade_animate); + cfdata->shading_list = eina_list_append(cfdata->shading_list, ow); + e_widget_list_object_append(ol, ow, 1, 1, 0.5); + e_widget_toolbook_page_append(otb, NULL, _("Shading"), ol, + 0, 0, 1, 0, 0.5, 0.0); - e_widget_toolbook_page_append - (otb, NULL, _("Shading"), ol, 0, 0, 1, 0, 0.5, 0.0); - - e_widget_on_change_hook_set(window_shading_check, _cb_disable_check_list, cfdata->shading_list); + e_widget_on_change_hook_set(oc, _cb_disable_check_list, + cfdata->shading_list); e_widget_toolbook_page_show(otb, 0); - return otb; }