formatting for seb

SVN revision: 77880
This commit is contained in:
Mike Blumenkrantz 2012-10-11 13:23:14 +00:00
parent bc3d8d18e2
commit 6134584e47
4 changed files with 1003 additions and 998 deletions

File diff suppressed because it is too large Load Diff

View File

@ -938,11 +938,11 @@ e_config_init(void)
E_CONFIG_LIST(D, T, xkb.used_options, _e_config_xkb_option_edd); E_CONFIG_LIST(D, T, xkb.used_options, _e_config_xkb_option_edd);
E_CONFIG_VAL(D, T, xkb.only_label, INT); E_CONFIG_VAL(D, T, xkb.only_label, INT);
E_CONFIG_VAL(D, T, xkb.default_model, STR); E_CONFIG_VAL(D, T, xkb.default_model, STR);
E_CONFIG_VAL(D, T, xkb.selected_layout, STR); E_CONFIG_VAL(D, T, xkb.selected_layout, STR);
E_CONFIG_VAL(D, T, xkb.cur_layout, STR); E_CONFIG_VAL(D, T, xkb.cur_layout, STR);
E_CONFIG_VAL(D, T, xkb.desklock_layout, STR); E_CONFIG_VAL(D, T, xkb.desklock_layout, STR);
//E_CONFIG_VAL(D, T, xkb.cur_group, INT); //E_CONFIG_VAL(D, T, xkb.cur_group, INT);
E_CONFIG_VAL(D, T, exe_always_single_instance, UCHAR); E_CONFIG_VAL(D, T, exe_always_single_instance, UCHAR);
e_config_load(); e_config_load();
@ -1356,7 +1356,7 @@ e_config_load(void)
E_CONFIG_LIMIT(e_config->icon_theme_overrides, 0, 1); E_CONFIG_LIMIT(e_config->icon_theme_overrides, 0, 1);
E_CONFIG_LIMIT(e_config->remember_internal_windows, 0, 3); E_CONFIG_LIMIT(e_config->remember_internal_windows, 0, 3);
E_CONFIG_LIMIT(e_config->desk_auto_switch, 0, 1); E_CONFIG_LIMIT(e_config->desk_auto_switch, 0, 1);
E_CONFIG_LIMIT(e_config->window_out_of_vscreen_limits, 0, 1); E_CONFIG_LIMIT(e_config->window_out_of_vscreen_limits, 0, 1);
E_CONFIG_LIMIT(e_config->window_out_of_vscreen_limits_partly, 0, 1); E_CONFIG_LIMIT(e_config->window_out_of_vscreen_limits_partly, 0, 1);
@ -1599,13 +1599,13 @@ e_config_save_block_get(void)
return _e_config_save_block; return _e_config_save_block;
} }
/** /**
* Loads configurations from file located in the working profile * Loads configurations from file located in the working profile
* The configurations are stored in a struct declated by the * The configurations are stored in a struct declated by the
* macros E_CONFIG_DD_NEW and E_CONFIG_<b>TYPE</b> * macros E_CONFIG_DD_NEW and E_CONFIG_<b>TYPE</b>
* *
* @param domain of the configuration file. * @param domain of the configuration file.
* @param edd to struct definition * @param edd to struct definition
* @return returns allocated struct on success, if unable to find config returns null * @return returns allocated struct on success, if unable to find config returns null
*/ */
EAPI void * EAPI void *
@ -1755,14 +1755,14 @@ e_config_profile_save(void)
return ok; return ok;
} }
/** /**
* Saves configurations to file located in the working profile * Saves configurations to file located in the working profile
* The configurations are read from a struct declated by the * The configurations are read from a struct declated by the
* macros E_CONFIG_DD_NEW and E_CONFIG_<b>TYPE</b> * macros E_CONFIG_DD_NEW and E_CONFIG_<b>TYPE</b>
* *
* @param domain name of the configuration file. * @param domain name of the configuration file.
* @param edd pointer to struct definition * @param edd pointer to struct definition
* @param data struct to save as configuration file * @param data struct to save as configuration file
* @return 1 if save success, 0 on failure * @return 1 if save success, 0 on failure
*/ */
EAPI int EAPI int

View File

@ -19,51 +19,51 @@ struct _Main_Data
}; };
/* local subsystem functions */ /* local subsystem functions */
static void _e_int_menus_main_del_hook(void *obj); static void _e_int_menus_main_del_hook(void *obj);
static void _e_int_menus_main_about(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_int_menus_main_about(void *data, E_Menu *m, E_Menu_Item *mi);
//static void _e_int_menus_fwin_favorites_item_cb(void *data, E_Menu *m, E_Menu_Item *mi); //static void _e_int_menus_fwin_favorites_item_cb(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_int_menus_apps_scan(E_Menu *m, Efreet_Menu *menu); static void _e_int_menus_apps_scan(E_Menu *m, Efreet_Menu *menu);
static void _e_int_menus_apps_start(void *data, E_Menu *m); static void _e_int_menus_apps_start(void *data, E_Menu *m);
static void _e_int_menus_apps_free_hook2(void *obj); static void _e_int_menus_apps_free_hook2(void *obj);
static void _e_int_menus_apps_run(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_int_menus_apps_run(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_int_menus_apps_drag(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_int_menus_apps_drag(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_int_menus_config_pre_cb(void *data, E_Menu *m); static void _e_int_menus_config_pre_cb(void *data, E_Menu *m);
static void _e_int_menus_config_free_hook(void *obj); static void _e_int_menus_config_free_hook(void *obj);
static void _e_int_menus_clients_pre_cb(void *data, E_Menu *m); static void _e_int_menus_clients_pre_cb(void *data, E_Menu *m);
static void _e_int_menus_clients_item_create(E_Border *bd, E_Menu *m); static void _e_int_menus_clients_item_create(E_Border *bd, E_Menu *m);
static void _e_int_menus_clients_free_hook(void *obj); static void _e_int_menus_clients_free_hook(void *obj);
static void _e_int_menus_clients_item_cb(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_int_menus_clients_item_cb(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_int_menus_clients_icon_cb(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_int_menus_clients_icon_cb(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_int_menus_clients_cleanup_cb(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_int_menus_clients_cleanup_cb(void *data, E_Menu *m, E_Menu_Item *mi);
static int _e_int_menus_clients_group_desk_cb(const void *d1, const void *d2); static int _e_int_menus_clients_group_desk_cb(const void *d1, const void *d2);
static int _e_int_menus_clients_group_class_cb(const void *d1, const void *d2); static int _e_int_menus_clients_group_class_cb(const void *d1, const void *d2);
static int _e_int_menus_clients_sort_alpha_cb(const void *d1, const void *d2); static int _e_int_menus_clients_sort_alpha_cb(const void *d1, const void *d2);
static int _e_int_menus_clients_sort_z_order_cb(const void *d1, const void *d2); static int _e_int_menus_clients_sort_z_order_cb(const void *d1, const void *d2);
static void _e_int_menus_clients_add_by_class(Eina_List *borders, E_Menu *m); static void _e_int_menus_clients_add_by_class(Eina_List *borders, E_Menu *m);
static void _e_int_menus_clients_add_by_desk(E_Desk *curr_desk, Eina_List *borders, E_Menu *m); static void _e_int_menus_clients_add_by_desk(E_Desk *curr_desk, Eina_List *borders, E_Menu *m);
static void _e_int_menus_clients_add_by_none(Eina_List *borders, E_Menu *m); static void _e_int_menus_clients_add_by_none(Eina_List *borders, E_Menu *m);
static void _e_int_menus_clients_menu_add_iconified(Eina_List *borders, E_Menu *m); static void _e_int_menus_clients_menu_add_iconified(Eina_List *borders, E_Menu *m);
static const char *_e_int_menus_clients_title_abbrv(const char *title); static const char *_e_int_menus_clients_title_abbrv(const char *title);
static void _e_int_menus_virtuals_pre_cb(void *data, E_Menu *m); static void _e_int_menus_virtuals_pre_cb(void *data, E_Menu *m);
static void _e_int_menus_virtuals_item_cb(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_int_menus_virtuals_item_cb(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_int_menus_virtuals_icon_cb(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_int_menus_virtuals_icon_cb(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_int_menus_themes_about(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_int_menus_themes_about(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_int_menus_lost_clients_pre_cb(void *data, E_Menu *m); static void _e_int_menus_lost_clients_pre_cb(void *data, E_Menu *m);
static void _e_int_menus_lost_clients_free_hook(void *obj); static void _e_int_menus_lost_clients_free_hook(void *obj);
static void _e_int_menus_lost_clients_item_cb(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_int_menus_lost_clients_item_cb(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_int_menus_augmentation_add(E_Menu *m, Eina_List *augmentation); static void _e_int_menus_augmentation_add(E_Menu *m, Eina_List *augmentation);
static void _e_int_menus_augmentation_del(E_Menu *m, Eina_List *augmentation); static void _e_int_menus_augmentation_del(E_Menu *m, Eina_List *augmentation);
static void _e_int_menus_shelves_pre_cb(void *data, E_Menu *m); static void _e_int_menus_shelves_pre_cb(void *data, E_Menu *m);
static void _e_int_menus_shelves_item_cb(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_int_menus_shelves_item_cb(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_int_menus_shelves_add_cb(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_int_menus_shelves_add_cb(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_int_menus_shelves_del_cb(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_int_menus_shelves_del_cb(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_int_menus_config_cb(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_int_menus_config_cb(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_int_menus_main_showhide(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_int_menus_main_showhide(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_int_menus_main_restart(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_int_menus_main_restart(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_int_menus_main_exit(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_int_menus_main_exit(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_int_menus_desktops_free_hook(void *obj); static void _e_int_menus_desktops_free_hook(void *obj);
static void _e_int_menus_desk_item_cb(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_int_menus_desk_item_cb(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_int_menus_item_label_set(Efreet_Menu *entry, E_Menu_Item *mi); static void _e_int_menus_item_label_set(Efreet_Menu *entry, E_Menu_Item *mi);
static Efreet_Menu *_e_int_menus_apps_thread_new(E_Menu *m, const char *dir); static Efreet_Menu *_e_int_menus_apps_thread_new(E_Menu *m, const char *dir);
//static void _e_int_menus_apps_drag_finished(E_Drag *drag, int dropped __UNUSED__); //static void _e_int_menus_apps_drag_finished(E_Drag *drag, int dropped __UNUSED__);
@ -270,7 +270,7 @@ e_int_menus_apps_new(const char *dir)
E_Menu *m; E_Menu *m;
m = e_menu_new(); m = e_menu_new();
if (dir) e_object_data_set(E_OBJECT(m), (void*)eina_stringshare_add(dir)); if (dir) e_object_data_set(E_OBJECT(m), (void *)eina_stringshare_add(dir));
e_menu_pre_activate_callback_set(m, _e_int_menus_apps_start, NULL); e_menu_pre_activate_callback_set(m, _e_int_menus_apps_start, NULL);
return m; return m;
} }
@ -728,7 +728,7 @@ _e_int_menus_apps_thread_new(E_Menu *m, const char *dir)
if (_e_int_menus_app_menus) if (_e_int_menus_app_menus)
menu = eina_hash_find(_e_int_menus_app_menus, dir); menu = eina_hash_find(_e_int_menus_app_menus, dir);
else else
_e_int_menus_app_menus = eina_hash_string_superfast_new((void*)efreet_menu_free); _e_int_menus_app_menus = eina_hash_string_superfast_new((void *)efreet_menu_free);
} }
else else
menu = _e_int_menus_app_menu_default; menu = _e_int_menus_app_menu_default;
@ -792,7 +792,7 @@ _e_int_menus_apps_free_hook2(void *obj)
m = obj; m = obj;
// XXX TODO: this should be automatic in e_menu, just get references right! // XXX TODO: this should be automatic in e_menu, just get references right!
// XXX TODO: fix references and remove me!!! // XXX TODO: fix references and remove me!!!
EINA_LIST_FOREACH_SAFE(m->items, l, l_next, mi) EINA_LIST_FOREACH_SAFE (m->items, l, l_next, mi)
{ {
if (mi->submenu) if (mi->submenu)
e_object_del(E_OBJECT(mi->submenu)); e_object_del(E_OBJECT(mi->submenu));

View File

@ -1,28 +1,28 @@
#include "e.h" #include "e.h"
static void *_create_data(E_Config_Dialog *cfd); static void *_create_data(E_Config_Dialog *cfd);
static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static void _free_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_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 _basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static Evas_Object *_basic_create(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(void *data, Evas_Object *obj);
static void _cb_disable_check_list(void *data, Evas_Object *obj); static void _cb_disable_check_list(void *data, Evas_Object *obj);
struct _E_Config_Dialog_Data struct _E_Config_Dialog_Data
{ {
int move_info_visible; int move_info_visible;
int move_info_follows; int move_info_follows;
int resize_info_visible; int resize_info_visible;
int resize_info_follows; int resize_info_follows;
int border_shade_animate; int border_shade_animate;
int border_shade_transition; int border_shade_transition;
double border_shade_speed; double border_shade_speed;
int use_app_icon; int use_app_icon;
int window_placement_policy; int window_placement_policy;
int window_grouping; int window_grouping;
int desk_auto_switch; int desk_auto_switch;
int window_out_of_vscreen_limits; int window_out_of_vscreen_limits;
int window_out_of_vscreen_limits_partly; int window_out_of_vscreen_limits_partly;
Eina_List *shading_list; Eina_List *shading_list;
}; };
@ -46,8 +46,8 @@ e_int_config_window_display(E_Container *con, const char *params __UNUSED__)
/* create config diaolg for NULL object/data */ /* 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", "E", "windows/window_display",
"preferences-system-windows", 0, v, NULL); "preferences-system-windows", 0, v, NULL);
return cfd; return cfd;
} }
@ -64,7 +64,7 @@ _create_data(E_Config_Dialog *cfd __UNUSED__)
cfdata->resize_info_follows = e_config->resize_info_follows; cfdata->resize_info_follows = e_config->resize_info_follows;
cfdata->use_app_icon = e_config->use_app_icon; cfdata->use_app_icon = e_config->use_app_icon;
cfdata->window_placement_policy = cfdata->window_placement_policy =
e_config->window_placement_policy; e_config->window_placement_policy;
cfdata->window_grouping = e_config->window_grouping; cfdata->window_grouping = e_config->window_grouping;
cfdata->desk_auto_switch = e_config->desk_auto_switch; cfdata->desk_auto_switch = e_config->desk_auto_switch;
@ -111,19 +111,19 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
static int static int
_basic_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) || return (e_config->window_placement_policy != cfdata->window_placement_policy) ||
(e_config->window_grouping != cfdata->window_grouping) || (e_config->window_grouping != cfdata->window_grouping) ||
(e_config->move_info_visible != cfdata->move_info_visible) || (e_config->move_info_visible != cfdata->move_info_visible) ||
(e_config->move_info_follows != cfdata->move_info_follows) || (e_config->move_info_follows != cfdata->move_info_follows) ||
(e_config->resize_info_visible != cfdata->resize_info_visible) || (e_config->resize_info_visible != cfdata->resize_info_visible) ||
(e_config->resize_info_follows != cfdata->resize_info_follows) || (e_config->resize_info_follows != cfdata->resize_info_follows) ||
(e_config->border_shade_animate != cfdata->border_shade_animate) || (e_config->border_shade_animate != cfdata->border_shade_animate) ||
(e_config->border_shade_transition != cfdata->border_shade_transition) || (e_config->border_shade_transition != cfdata->border_shade_transition) ||
(e_config->border_shade_speed != cfdata->border_shade_speed) || (e_config->border_shade_speed != cfdata->border_shade_speed) ||
(e_config->use_app_icon != cfdata->use_app_icon) || (e_config->use_app_icon != cfdata->use_app_icon) ||
(e_config->desk_auto_switch != cfdata->desk_auto_switch) || (e_config->desk_auto_switch != cfdata->desk_auto_switch) ||
(e_config->window_out_of_vscreen_limits != cfdata->window_out_of_vscreen_limits) || (e_config->window_out_of_vscreen_limits != cfdata->window_out_of_vscreen_limits) ||
(e_config->window_out_of_vscreen_limits_partly != cfdata->window_out_of_vscreen_limits_partly)); (e_config->window_out_of_vscreen_limits_partly != cfdata->window_out_of_vscreen_limits_partly);
} }
static Evas_Object * static Evas_Object *
@ -145,10 +145,10 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
e_widget_list_object_append(ol, of, 1, 1, 0.5); e_widget_list_object_append(ol, of, 1, 1, 0.5);
of = e_widget_framelist_add(evas, _("Move Geometry"), 0); of = e_widget_framelist_add(evas, _("Move Geometry"), 0);
oc = e_widget_check_add(evas, _("Display information"), oc = e_widget_check_add(evas, _("Display information"),
&(cfdata->move_info_visible)); &(cfdata->move_info_visible));
e_widget_framelist_object_append(of, oc); e_widget_framelist_object_append(of, oc);
ow = e_widget_check_add(evas, _("Follows the window"), ow = e_widget_check_add(evas, _("Follows the window"),
&(cfdata->move_info_follows)); &(cfdata->move_info_follows));
e_widget_disabled_set(ow, !cfdata->move_info_visible); e_widget_disabled_set(ow, !cfdata->move_info_visible);
e_widget_on_change_hook_set(oc, _cb_disable_check, ow); e_widget_on_change_hook_set(oc, _cb_disable_check, ow);
@ -156,120 +156,120 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
e_widget_list_object_append(ol, of, 1, 1, 0.5); e_widget_list_object_append(ol, of, 1, 1, 0.5);
of = e_widget_framelist_add(evas, _("Resize Geometry"), 0); of = e_widget_framelist_add(evas, _("Resize Geometry"), 0);
oc = e_widget_check_add(evas, _("Display information"), oc = e_widget_check_add(evas, _("Display information"),
&(cfdata->resize_info_visible)); &(cfdata->resize_info_visible));
e_widget_framelist_object_append(of, oc); e_widget_framelist_object_append(of, oc);
ow = e_widget_check_add(evas, _("Follows the window"), ow = e_widget_check_add(evas, _("Follows the window"),
&(cfdata->resize_info_follows)); &(cfdata->resize_info_follows));
e_widget_disabled_set(ow, !cfdata->resize_info_visible); e_widget_disabled_set(ow, !cfdata->resize_info_visible);
e_widget_on_change_hook_set(oc, _cb_disable_check, ow); e_widget_on_change_hook_set(oc, _cb_disable_check, ow);
e_widget_framelist_object_append(of, ow); e_widget_framelist_object_append(of, ow);
e_widget_list_object_append(ol, of, 1, 1, 0.5); e_widget_list_object_append(ol, of, 1, 1, 0.5);
e_widget_toolbook_page_append(otb, NULL, _("Display"), ol, e_widget_toolbook_page_append(otb, NULL, _("Display"), ol,
0, 0, 1, 0, 0.5, 0.0); 0, 0, 1, 0, 0.5, 0.0);
/* New Windows */ /* New Windows */
ol = e_widget_list_add(evas, 0, 0); ol = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, _("Placement"), 0); of = e_widget_framelist_add(evas, _("Placement"), 0);
rg = e_widget_radio_group_new(&(cfdata->window_placement_policy)); rg = e_widget_radio_group_new(&(cfdata->window_placement_policy));
ow = e_widget_radio_add(evas, _("Smart Placement"), ow = e_widget_radio_add(evas, _("Smart Placement"),
E_WINDOW_PLACEMENT_SMART, rg); E_WINDOW_PLACEMENT_SMART, rg);
e_widget_framelist_object_append(of, ow); e_widget_framelist_object_append(of, ow);
ow = e_widget_radio_add(evas, _("Don't hide Gadgets"), ow = e_widget_radio_add(evas, _("Don't hide Gadgets"),
E_WINDOW_PLACEMENT_ANTIGADGET, rg); E_WINDOW_PLACEMENT_ANTIGADGET, rg);
e_widget_framelist_object_append(of, ow); e_widget_framelist_object_append(of, ow);
ow = e_widget_radio_add(evas, _("Place at mouse pointer"), ow = e_widget_radio_add(evas, _("Place at mouse pointer"),
E_WINDOW_PLACEMENT_CURSOR, rg); E_WINDOW_PLACEMENT_CURSOR, rg);
e_widget_framelist_object_append(of, ow); e_widget_framelist_object_append(of, ow);
ow = e_widget_radio_add(evas, _("Place manually with the mouse"), ow = e_widget_radio_add(evas, _("Place manually with the mouse"),
E_WINDOW_PLACEMENT_MANUAL, rg); E_WINDOW_PLACEMENT_MANUAL, rg);
e_widget_framelist_object_append(of, ow); e_widget_framelist_object_append(of, ow);
ow = e_widget_check_add(evas, _("Group with windows of the same application"), ow = e_widget_check_add(evas, _("Group with windows of the same application"),
&(cfdata->window_grouping)); &(cfdata->window_grouping));
e_widget_framelist_object_append(of, ow); e_widget_framelist_object_append(of, ow);
e_widget_list_object_append(ol, of, 1, 1, 0.5); e_widget_list_object_append(ol, of, 1, 1, 0.5);
ow = e_widget_check_add(evas, _("Switch to desktop of new window"), ow = e_widget_check_add(evas, _("Switch to desktop of new window"),
&(cfdata->desk_auto_switch)); &(cfdata->desk_auto_switch));
e_widget_list_object_append(ol, ow, 1, 1, 0.5); e_widget_list_object_append(ol, ow, 1, 1, 0.5);
e_widget_toolbook_page_append(otb, NULL, _("New Windows"), ol, e_widget_toolbook_page_append(otb, NULL, _("New Windows"), ol,
0, 0, 1, 0, 0.5, 0.0); 0, 0, 1, 0, 0.5, 0.0);
/* Shading */ /* Shading */
ol = e_widget_list_add(evas, 0, 0); ol = e_widget_list_add(evas, 0, 0);
oc = e_widget_check_add(evas, _("Animate"), oc = e_widget_check_add(evas, _("Animate"),
&(cfdata->border_shade_animate)); &(cfdata->border_shade_animate));
e_widget_list_object_append(ol, oc, 1, 1, 0.5); e_widget_list_object_append(ol, oc, 1, 1, 0.5);
ow = e_widget_slider_add(evas, 1, 0, _("%4.0f pixels/s"), ow = e_widget_slider_add(evas, 1, 0, _("%4.0f pixels/s"),
100, 9900, 100, 0, 100, 9900, 100, 0,
&(cfdata->border_shade_speed), NULL, 100); &(cfdata->border_shade_speed), NULL, 100);
e_widget_disabled_set(ow, !cfdata->border_shade_animate); e_widget_disabled_set(ow, !cfdata->border_shade_animate);
cfdata->shading_list = eina_list_append(cfdata->shading_list, ow); cfdata->shading_list = eina_list_append(cfdata->shading_list, ow);
e_widget_list_object_append(ol, ow, 1, 1, 0.5); e_widget_list_object_append(ol, ow, 1, 1, 0.5);
rg = e_widget_radio_group_new(&(cfdata->border_shade_transition)); rg = e_widget_radio_group_new(&(cfdata->border_shade_transition));
ow = e_widget_radio_add(evas, _("Linear"), E_TRANSITION_LINEAR, rg); ow = e_widget_radio_add(evas, _("Linear"), E_TRANSITION_LINEAR, rg);
e_widget_disabled_set(ow, !cfdata->border_shade_animate); e_widget_disabled_set(ow, !cfdata->border_shade_animate);
cfdata->shading_list = eina_list_append(cfdata->shading_list, ow); cfdata->shading_list = eina_list_append(cfdata->shading_list, ow);
e_widget_list_object_append(ol, ow, 1, 1, 0.5); e_widget_list_object_append(ol, ow, 1, 1, 0.5);
ow = e_widget_radio_add(evas, _("Accelerate, then decelerate"), E_TRANSITION_SINUSOIDAL, rg); ow = e_widget_radio_add(evas, _("Accelerate, then decelerate"), E_TRANSITION_SINUSOIDAL, rg);
e_widget_disabled_set(ow, !cfdata->border_shade_animate); e_widget_disabled_set(ow, !cfdata->border_shade_animate);
cfdata->shading_list = eina_list_append(cfdata->shading_list, ow); cfdata->shading_list = eina_list_append(cfdata->shading_list, ow);
e_widget_list_object_append(ol, ow, 1, 1, 0.5); e_widget_list_object_append(ol, ow, 1, 1, 0.5);
ow = e_widget_radio_add(evas, _("Accelerate"), E_TRANSITION_ACCELERATE, rg); ow = e_widget_radio_add(evas, _("Accelerate"), E_TRANSITION_ACCELERATE, rg);
e_widget_disabled_set(ow, !cfdata->border_shade_animate); e_widget_disabled_set(ow, !cfdata->border_shade_animate);
cfdata->shading_list = eina_list_append(cfdata->shading_list, ow); cfdata->shading_list = eina_list_append(cfdata->shading_list, ow);
e_widget_list_object_append(ol, ow, 1, 1, 0.5); e_widget_list_object_append(ol, ow, 1, 1, 0.5);
ow = e_widget_radio_add(evas, _("Decelerate"), E_TRANSITION_DECELERATE, rg); ow = e_widget_radio_add(evas, _("Decelerate"), E_TRANSITION_DECELERATE, rg);
e_widget_disabled_set(ow, !cfdata->border_shade_animate); e_widget_disabled_set(ow, !cfdata->border_shade_animate);
cfdata->shading_list = eina_list_append(cfdata->shading_list, ow); cfdata->shading_list = eina_list_append(cfdata->shading_list, ow);
e_widget_list_object_append(ol, ow, 1, 1, 0.5); e_widget_list_object_append(ol, ow, 1, 1, 0.5);
ow = e_widget_radio_add(evas, _("Pronounced Accelerate"), E_TRANSITION_ACCELERATE_LOTS, rg); ow = e_widget_radio_add(evas, _("Pronounced Accelerate"), E_TRANSITION_ACCELERATE_LOTS, rg);
e_widget_disabled_set(ow, !cfdata->border_shade_animate); e_widget_disabled_set(ow, !cfdata->border_shade_animate);
cfdata->shading_list = eina_list_append(cfdata->shading_list, ow); cfdata->shading_list = eina_list_append(cfdata->shading_list, ow);
e_widget_list_object_append(ol, ow, 1, 1, 0.5); e_widget_list_object_append(ol, ow, 1, 1, 0.5);
ow = e_widget_radio_add(evas, _("Pronounced Decelerate"), E_TRANSITION_DECELERATE_LOTS, rg); ow = e_widget_radio_add(evas, _("Pronounced Decelerate"), E_TRANSITION_DECELERATE_LOTS, rg);
e_widget_disabled_set(ow, !cfdata->border_shade_animate); e_widget_disabled_set(ow, !cfdata->border_shade_animate);
cfdata->shading_list = eina_list_append(cfdata->shading_list, ow); cfdata->shading_list = eina_list_append(cfdata->shading_list, ow);
e_widget_list_object_append(ol, ow, 1, 1, 0.5); e_widget_list_object_append(ol, ow, 1, 1, 0.5);
ow = e_widget_radio_add(evas, _("Pronounced Accelerate, then decelerate"), E_TRANSITION_SINUSOIDAL_LOTS, rg); ow = e_widget_radio_add(evas, _("Pronounced Accelerate, then decelerate"), E_TRANSITION_SINUSOIDAL_LOTS, rg);
e_widget_disabled_set(ow, !cfdata->border_shade_animate); e_widget_disabled_set(ow, !cfdata->border_shade_animate);
cfdata->shading_list = eina_list_append(cfdata->shading_list, ow); cfdata->shading_list = eina_list_append(cfdata->shading_list, ow);
e_widget_list_object_append(ol, ow, 1, 1, 0.5); e_widget_list_object_append(ol, ow, 1, 1, 0.5);
ow = e_widget_radio_add(evas, _("Bounce"), E_TRANSITION_BOUNCE, rg); ow = e_widget_radio_add(evas, _("Bounce"), E_TRANSITION_BOUNCE, rg);
e_widget_disabled_set(ow, !cfdata->border_shade_animate); e_widget_disabled_set(ow, !cfdata->border_shade_animate);
cfdata->shading_list = eina_list_append(cfdata->shading_list, ow); cfdata->shading_list = eina_list_append(cfdata->shading_list, ow);
e_widget_list_object_append(ol, ow, 1, 1, 0.5); e_widget_list_object_append(ol, ow, 1, 1, 0.5);
ow = e_widget_radio_add(evas, _("Bounce more"), E_TRANSITION_BOUNCE_LOTS, rg); ow = e_widget_radio_add(evas, _("Bounce more"), E_TRANSITION_BOUNCE_LOTS, rg);
e_widget_disabled_set(ow, !cfdata->border_shade_animate); e_widget_disabled_set(ow, !cfdata->border_shade_animate);
cfdata->shading_list = eina_list_append(cfdata->shading_list, ow); cfdata->shading_list = eina_list_append(cfdata->shading_list, ow);
e_widget_list_object_append(ol, ow, 1, 1, 0.5); e_widget_list_object_append(ol, ow, 1, 1, 0.5);
e_widget_toolbook_page_append(otb, NULL, _("Shading"), ol, e_widget_toolbook_page_append(otb, NULL, _("Shading"), ol,
0, 0, 1, 0, 0.5, 0.0); 0, 0, 1, 0, 0.5, 0.0);
e_widget_on_change_hook_set(oc, _cb_disable_check_list, e_widget_on_change_hook_set(oc, _cb_disable_check_list,
cfdata->shading_list); cfdata->shading_list);
/* Screen Limits */ /* Screen Limits */
ol = e_widget_list_add(evas, 0, 0); ol = e_widget_list_add(evas, 0, 0);
oc = e_widget_check_add(evas, _("Allow windows out of visual screen limits"), oc = e_widget_check_add(evas, _("Allow windows out of visual screen limits"),
&(cfdata->window_out_of_vscreen_limits)); &(cfdata->window_out_of_vscreen_limits));
e_widget_list_object_append(ol, oc, 1, 1, 0.5); e_widget_list_object_append(ol, oc, 1, 1, 0.5);
oc = e_widget_check_add(evas, _("Allow windows partly out of screen limits"), oc = e_widget_check_add(evas, _("Allow windows partly out of screen limits"),
&(cfdata->window_out_of_vscreen_limits_partly)); &(cfdata->window_out_of_vscreen_limits_partly));
e_widget_list_object_append(ol, oc, 1, 1, 0.5); e_widget_list_object_append(ol, oc, 1, 1, 0.5);
e_widget_toolbook_page_append(otb, NULL, _("Screen Limits"), ol, e_widget_toolbook_page_append(otb, NULL, _("Screen Limits"), ol,
0, 0, 1, 0, 0.5, 0.0); 0, 0, 1, 0, 0.5, 0.0);
e_widget_toolbook_page_show(otb, 0); e_widget_toolbook_page_show(otb, 0);
@ -291,5 +291,6 @@ _cb_disable_check_list(void *data, Evas_Object *obj)
Eina_Bool disable = !e_widget_check_checked_get(obj); Eina_Bool disable = !e_widget_check_checked_get(obj);
EINA_LIST_FOREACH(list, l, o) EINA_LIST_FOREACH(list, l, o)
e_widget_disabled_set(o, disable); e_widget_disabled_set(o, disable);
} }