Make winlist Advanced work for all resolutions. (May need some label

changes or other organization here, but the bulk of the work is done).

SVN revision: 46914

diff --git a/src/modules/conf_winlist/e_int_config_winlist.c b/src/modules/conf_winlist/e_int_config_winlist.c
index 1088fec..95d6d08 100644 (file)
--- a/src/modules/conf_winlist/e_int_config_winlist.c
+++ b/src/modules/conf_winlist/e_int_config_winlist.c
@@ -1,14 +1,14 @@
 #include "e.h"
 
-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 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);
+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(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 int _advanced_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_advanced_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_enable_check(void *data, Evas_Object *obj);
+static void _cb_disable_check_list(void *data, Evas_Object *obj);
 
 struct _E_Config_Dialog_Data 
 {
@@ -53,13 +53,12 @@ e_int_config_winlist(E_Container *con, const char *params __UNUSED__)
    
    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->advanced.apply_cfdata = _advanced_apply_data;
-   v->advanced.create_widgets = _advanced_create_widgets;
+   v->basic.apply_cfdata = _basic_apply;
+   v->basic.create_widgets = _basic_create;
+   v->advanced.apply_cfdata = _advanced_apply;
+   v->advanced.create_widgets = _advanced_create;
 
-   cfd = e_config_dialog_new(con,
-                            _("Window List Settings"),
+   cfd = e_config_dialog_new(con, _("Window List Settings"),
                             "E", "advanced/window_list",
                             "preferences-winlist", 0, v, NULL);
    return cfd;
@@ -74,14 +73,22 @@ _fill_data(E_Config_Dialog_Data *cfdata)
    cfdata->scroll_animate = e_config->winlist_scroll_animate;
    cfdata->scroll_speed = e_config->winlist_scroll_speed;
    cfdata->list_show_iconified = e_config->winlist_list_show_iconified;
-   cfdata->list_show_other_desk_iconified = e_config->winlist_list_show_other_desk_iconified;
-   cfdata->list_show_other_screen_iconified = e_config->winlist_list_show_other_screen_iconified;
-   cfdata->list_show_other_desk_windows = e_config->winlist_list_show_other_desk_windows;
-   cfdata->list_show_other_screen_windows = e_config->winlist_list_show_other_screen_windows;
-   cfdata->list_uncover_while_selecting = e_config->winlist_list_uncover_while_selecting;
-   cfdata->list_jump_desk_while_selecting = e_config->winlist_list_jump_desk_while_selecting;
-   cfdata->list_focus_while_selecting = e_config->winlist_list_focus_while_selecting;
-   cfdata->list_raise_while_selecting = e_config->winlist_list_raise_while_selecting;
+   cfdata->list_show_other_desk_iconified = 
+     e_config->winlist_list_show_other_desk_iconified;
+   cfdata->list_show_other_screen_iconified = 
+     e_config->winlist_list_show_other_screen_iconified;
+   cfdata->list_show_other_desk_windows = 
+     e_config->winlist_list_show_other_desk_windows;
+   cfdata->list_show_other_screen_windows = 
+     e_config->winlist_list_show_other_screen_windows;
+   cfdata->list_uncover_while_selecting = 
+     e_config->winlist_list_uncover_while_selecting;
+   cfdata->list_jump_desk_while_selecting = 
+     e_config->winlist_list_jump_desk_while_selecting;
+   cfdata->list_focus_while_selecting = 
+     e_config->winlist_list_focus_while_selecting;
+   cfdata->list_raise_while_selecting = 
+     e_config->winlist_list_raise_while_selecting;
    cfdata->pos_align_x = e_config->winlist_pos_align_x;
    cfdata->pos_align_y = e_config->winlist_pos_align_y;
    cfdata->pos_size_w = e_config->winlist_pos_size_w;
@@ -113,69 +120,87 @@ _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) 
+_basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
 {
    e_config->winlist_list_show_iconified = cfdata->list_show_iconified;
-   e_config->winlist_list_show_other_desk_iconified = cfdata->list_show_other_desk_iconified;
-   e_config->winlist_list_show_other_screen_iconified = cfdata->list_show_other_screen_iconified;
-   e_config->winlist_list_show_other_desk_windows = cfdata->list_show_other_desk_windows;
-   e_config->winlist_list_show_other_screen_windows = cfdata->list_show_other_screen_windows;
-   e_config->winlist_list_uncover_while_selecting = cfdata->list_uncover_while_selecting;
-   e_config->winlist_list_jump_desk_while_selecting = cfdata->list_jump_desk_while_selecting;
+   e_config->winlist_list_show_other_desk_iconified = 
+     cfdata->list_show_other_desk_iconified;
+   e_config->winlist_list_show_other_screen_iconified = 
+     cfdata->list_show_other_screen_iconified;
+   e_config->winlist_list_show_other_desk_windows = 
+     cfdata->list_show_other_desk_windows;
+   e_config->winlist_list_show_other_screen_windows = 
+     cfdata->list_show_other_screen_windows;
+   e_config->winlist_list_uncover_while_selecting = 
+     cfdata->list_uncover_while_selecting;
+   e_config->winlist_list_jump_desk_while_selecting = 
+     cfdata->list_jump_desk_while_selecting;
    e_config->winlist_warp_while_selecting = cfdata->warp_while_selecting;
    e_config->winlist_warp_at_end = cfdata->warp_at_end;
    e_config->winlist_scroll_animate = cfdata->scroll_animate;
-   e_config->winlist_list_focus_while_selecting = cfdata->list_focus_while_selecting;
-   e_config->winlist_list_raise_while_selecting = cfdata->list_raise_while_selecting;
+   e_config->winlist_list_focus_while_selecting = 
+     cfdata->list_focus_while_selecting;
+   e_config->winlist_list_raise_while_selecting = 
+     cfdata->list_raise_while_selecting;
    e_config_save_queue();
-   
+
    return 1;
 }
 
 static Evas_Object *
-_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 
+_basic_create(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);
-   iconified_check = e_widget_check_add(evas, _("Show iconified windows"), &(cfdata->list_show_iconified));
+   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));
+   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_disabled_set(ob, !cfdata->list_show_iconified);
    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));
+   ob = e_widget_check_add(evas, _("Show iconified windows from other screens"), 
+                           &(cfdata->list_show_other_screen_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_disabled_set(ob, !cfdata->list_show_iconified);
    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_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));
+   ob = e_widget_check_add(evas, _("Show windows from other screens"), 
+                           &(cfdata->list_show_other_screen_windows));
    e_widget_framelist_object_append(of, ob);
    e_widget_list_object_append(o, of, 1, 1, 0.5);   
 
    of = e_widget_framelist_add(evas, _("Selection Settings"), 0);   
-   ob = e_widget_check_add(evas, _("Focus window while selecting"), &(cfdata->list_focus_while_selecting));
+   ob = e_widget_check_add(evas, _("Focus window while selecting"), 
+                           &(cfdata->list_focus_while_selecting));
    e_widget_framelist_object_append(of, ob);
-   ob = e_widget_check_add(evas, _("Raise window while selecting"), &(cfdata->list_raise_while_selecting));
+   ob = e_widget_check_add(evas, _("Raise window while selecting"), 
+                           &(cfdata->list_raise_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));
+   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));
+   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));
+   ob = e_widget_check_add(evas, _("Jump to desk while selecting"), 
+                           &(cfdata->list_jump_desk_while_selecting));
    e_widget_framelist_object_append(of, ob);
    e_widget_list_object_append(o, of, 1, 1, 0.5);   
-      
+
    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_disabled_set(ob, cfdata->warp_while_selecting);
    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);   
@@ -184,25 +209,33 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    ob = e_widget_check_add(evas, _("Scroll Animate"), &(cfdata->scroll_animate));
    e_widget_framelist_object_append(of, ob);
    e_widget_list_object_append(o, of, 1, 1, 0.5);   
-   
+
    return o;
 }
 
 static int
-_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
+_advanced_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
 {
    e_config->winlist_list_show_iconified = cfdata->list_show_iconified;
-   e_config->winlist_list_show_other_desk_iconified = cfdata->list_show_other_desk_iconified;
-   e_config->winlist_list_show_other_screen_iconified = cfdata->list_show_other_screen_iconified;
-   e_config->winlist_list_show_other_desk_windows = cfdata->list_show_other_desk_windows;
-   e_config->winlist_list_show_other_screen_windows = cfdata->list_show_other_screen_windows;
-   e_config->winlist_list_uncover_while_selecting = cfdata->list_uncover_while_selecting;
-   e_config->winlist_list_jump_desk_while_selecting = cfdata->list_jump_desk_while_selecting;
+   e_config->winlist_list_show_other_desk_iconified = 
+     cfdata->list_show_other_desk_iconified;
+   e_config->winlist_list_show_other_screen_iconified = 
+     cfdata->list_show_other_screen_iconified;
+   e_config->winlist_list_show_other_desk_windows = 
+     cfdata->list_show_other_desk_windows;
+   e_config->winlist_list_show_other_screen_windows = 
+     cfdata->list_show_other_screen_windows;
+   e_config->winlist_list_uncover_while_selecting = 
+     cfdata->list_uncover_while_selecting;
+   e_config->winlist_list_jump_desk_while_selecting = 
+     cfdata->list_jump_desk_while_selecting;
    e_config->winlist_warp_while_selecting = cfdata->warp_while_selecting;
    e_config->winlist_warp_at_end = cfdata->warp_at_end;
    e_config->winlist_scroll_animate = cfdata->scroll_animate;
-   e_config->winlist_list_focus_while_selecting = cfdata->list_focus_while_selecting;
-   e_config->winlist_list_raise_while_selecting = cfdata->list_raise_while_selecting;
+   e_config->winlist_list_focus_while_selecting = 
+     cfdata->list_focus_while_selecting;
+   e_config->winlist_list_raise_while_selecting = 
+     cfdata->list_raise_while_selecting;
    e_config->winlist_warp_speed = cfdata->warp_speed;
    e_config->winlist_scroll_speed = cfdata->scroll_speed;
    e_config->winlist_pos_align_x = cfdata->pos_align_x;
@@ -217,102 +250,119 @@ _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) 
+_advanced_create(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);
+   Evas_Object *otb, *ol, *ow, *oc;
 
-   /* REMOVED AS ADVANCED DOESN"T FIT INTO 640x480 WITH IT */
-   /*
-   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);
-   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));
-   e_widget_framelist_object_append(of, ob);
-   e_widget_table_object_append(ot, of, 0, 0, 1, 1, 1, 1, 1, 1);
-   */   
+   otb = e_widget_toolbook_add(evas, (48 * e_scale), (48 * e_scale));
 
-   of = e_widget_framelist_add(evas, _("Selection Settings"), 0);   
-   ob = e_widget_check_add(evas, _("Focus window while selecting"), &(cfdata->list_focus_while_selecting));
-   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);
-   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));
-   e_widget_framelist_object_append(of, ob);
-   e_widget_table_object_append(ot, of, 0, 0, 1, 1, 1, 1, 1, 1);
-      
-   of = e_widget_framelist_add(evas, _("Warp Settings"), 0);   
-   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);
+   ol = e_widget_list_add(evas, 0, 0);
+   ow = e_widget_check_add(evas, _("Show iconified windows"), 
+                           &(cfdata->list_show_iconified));
+   e_widget_list_object_append(ol, ow, 1, 1, 0.5);
+   ow = e_widget_check_add(evas, _("Show windows from other desks"), 
+                           &(cfdata->list_show_other_desk_windows));
+   e_widget_list_object_append(ol, ow, 1, 1, 0.5);
+   ow = e_widget_check_add(evas, _("Show windows from other screens"), 
+                           &(cfdata->list_show_other_screen_windows));
+   e_widget_list_object_append(ol, ow, 1, 1, 0.5);
+   e_widget_toolbook_page_append(otb, NULL, _("General Settings"), ol, 
+                                 0, 0, 0, 0, 0.5, 0.0);
 
-   of = e_widget_framelist_add(evas, _("Scroll Settings"), 0);   
-   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);
-   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);
+   ol = e_widget_list_add(evas, 0, 0);
+   ow = e_widget_check_add(evas, _("Focus window while selecting"), 
+                           &(cfdata->list_focus_while_selecting));
+   e_widget_list_object_append(ol, ow, 1, 1, 0.5);
+   ow = e_widget_check_add(evas, _("Raise window while selecting"), 
+                           &(cfdata->list_raise_while_selecting));
+   e_widget_list_object_append(ol, ow, 1, 1, 0.5);
+   ow = e_widget_check_add(evas, _("Warp mouse to window while selecting"), 
+                           &(cfdata->warp_while_selecting));
+   e_widget_list_object_append(ol, ow, 1, 1, 0.5);
+   ow = e_widget_check_add(evas, _("Uncover windows while selecting"), 
+                           &(cfdata->list_uncover_while_selecting));
+   e_widget_list_object_append(ol, ow, 1, 1, 0.5);
+   ow = e_widget_check_add(evas, _("Jump to desk while selecting"), 
+                           &(cfdata->list_jump_desk_while_selecting));
+   e_widget_list_object_append(ol, ow, 1, 1, 0.5);
+   e_widget_toolbook_page_append(otb, NULL, _("Selection Settings"), ol, 
+                                 0, 0, 0, 0, 0.5, 0.0);
 
-   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);
-   ob = e_widget_slider_add(evas, 1, 0, _("%1.2f"), 0.0, 1.0, 0.01, 0, &(cfdata->pos_align_x), NULL, 200);
-   e_widget_framelist_object_append(of, ob);   
-   ob = e_widget_label_add(evas, _("Y-Axis Alignment"));
-   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->pos_align_y), NULL, 200);
-   e_widget_framelist_object_append(of, ob);   
-   e_widget_table_object_append(ot, of, 1, 0, 1, 1, 1, 1, 1, 1);
+   ol = e_widget_list_add(evas, 0, 0);
+   oc = e_widget_check_add(evas, _("Warp At End"), &(cfdata->warp_at_end));
+   e_widget_list_object_append(ol, oc, 1, 1, 0.5);
+   ow = e_widget_label_add(evas, _("Warp Speed"));
+   e_widget_list_object_append(ol, ow, 1, 1, 0.5);
+   warp_at_end_list = eina_list_append(warp_at_end_list, ow);
+   e_widget_disabled_set(ow, !cfdata->warp_at_end);
 
-   of = e_widget_framelist_add(evas, _("Size Settings"), 0);      
-   ob = e_widget_label_add(evas, _("Minimum Width"));
-   e_widget_framelist_object_append(of, ob);
-   ob = e_widget_slider_add(evas, 1, 0, _("%4.0f"), 0, 4000, 50, 0, NULL, &(cfdata->pos_min_w), 200);
-   e_widget_framelist_object_append(of, ob);   
-   ob = e_widget_label_add(evas, _("Minimum Height"));
-   e_widget_framelist_object_append(of, ob);
-   ob = e_widget_slider_add(evas, 1, 0, _("%4.0f"), 0, 4000, 50, 0, NULL, &(cfdata->pos_min_h), 200);
-   e_widget_framelist_object_append(of, ob);   
-   ob = e_widget_label_add(evas, _("Maximum Width"));
-   e_widget_framelist_object_append(of, ob);
-   ob = e_widget_slider_add(evas, 1, 0, _("%4.0f"), 0, 4000, 50, 0, NULL, &(cfdata->pos_max_w), 200);
-   e_widget_framelist_object_append(of, ob);   
-   ob = e_widget_label_add(evas, _("Maximum Height"));
-   e_widget_framelist_object_append(of, ob);
-   ob = e_widget_slider_add(evas, 1, 0, _("%4.0f"), 0, 4000, 50, 0, NULL, &(cfdata->pos_max_h), 200);
-   e_widget_framelist_object_append(of, ob);   
-   e_widget_table_object_append(ot, of, 1, 1, 1, 2, 1, 1, 1, 1);
+   ow = e_widget_slider_add(evas, 1, 0, _("%1.2f"), 0.0, 1.0, 0.01, 0, 
+                            &(cfdata->warp_speed), NULL, 100);
+   e_widget_list_object_append(ol, ow, 1, 1, 0.5);
+   warp_at_end_list = eina_list_append (warp_at_end_list, ow);
+   e_widget_disabled_set(ow, !cfdata->warp_at_end);
+   e_widget_on_change_hook_set(oc, _cb_disable_check_list, warp_at_end_list);
+   e_widget_toolbook_page_append(otb, NULL, _("Warp Settings"), ol, 
+                                 0, 0, 0, 0, 0.5, 0.0);
+
+   ol = e_widget_list_add(evas, 0, 0);
+   oc = e_widget_check_add(evas, _("Scroll Animate"), &(cfdata->scroll_animate));
+   e_widget_list_object_append(ol, oc, 1, 1, 0.5);
+   ow = e_widget_label_add(evas, _("Scroll Speed"));
+   e_widget_list_object_append(ol, ow, 1, 1, 0.5);
+   e_widget_disabled_set(ow, !cfdata->scroll_animate);
+   scroll_animation_list = eina_list_append(scroll_animation_list , ow);
+   ow = e_widget_slider_add(evas, 1, 0, _("%1.2f"), 0.0, 1.0, 0.01, 0, 
+                            &(cfdata->scroll_speed), NULL, 100);
+   e_widget_list_object_append(ol, ow, 1, 1, 0.5);
+   e_widget_disabled_set(ow, !cfdata->scroll_animate);
+   scroll_animation_list = eina_list_append(scroll_animation_list , ow);
+   e_widget_on_change_hook_set(oc, _cb_disable_check_list, scroll_animation_list);
+
+   e_widget_toolbook_page_append(otb, NULL, _("Scroll Settings"), ol, 
+                                 0, 0, 0, 0, 0.5, 0.0);
+
+   ol = e_widget_list_add(evas, 0, 0);
+   ow = e_widget_label_add(evas, _("X-Axis Alignment"));
+   e_widget_list_object_append(ol, ow, 1, 1, 0.5);
+   ow = e_widget_slider_add(evas, 1, 0, _("%1.2f"), 0.0, 1.0, 0.01, 0, 
+                            &(cfdata->pos_align_x), NULL, 100);
+   e_widget_list_object_append(ol, ow, 1, 1, 0.5);
+   ow = e_widget_label_add(evas, _("Y-Axis Alignment"));
+   e_widget_list_object_append(ol, ow, 1, 1, 0.5);
+   ow = e_widget_slider_add(evas, 1, 0, _("%1.2f"), 0.0, 1.0, 0.01, 0, 
+                            &(cfdata->pos_align_y), NULL, 100);
+   e_widget_list_object_append(ol, ow, 1, 1, 0.5);
+   e_widget_toolbook_page_append(otb, NULL, _("Position Settings"), ol, 
+                                 0, 0, 0, 0, 0.5, 0.0);
+
+   ol = e_widget_list_add(evas, 0, 0);
+   ow = e_widget_label_add(evas, _("Minimum Width"));
+   e_widget_list_object_append(ol, ow, 1, 1, 0.5);
+   ow = e_widget_slider_add(evas, 1, 0, _("%4.0f"), 0, 4000, 50, 0, NULL, 
+                            &(cfdata->pos_min_w), 100);
+   e_widget_list_object_append(ol, ow, 1, 1, 0.5);
+   ow = e_widget_label_add(evas, _("Minimum Height"));
+   e_widget_list_object_append(ol, ow, 1, 1, 0.5);
+   ow = e_widget_slider_add(evas, 1, 0, _("%4.0f"), 0, 4000, 50, 0, NULL, 
+                            &(cfdata->pos_min_h), 100);
+   e_widget_list_object_append(ol, ow, 1, 1, 0.5);
+   ow = e_widget_label_add(evas, _("Maximum Width"));
+   e_widget_list_object_append(ol, ow, 1, 1, 0.5);
+   ow = e_widget_slider_add(evas, 1, 0, _("%4.0f"), 0, 4000, 50, 0, NULL, 
+                            &(cfdata->pos_max_w), 100);
+   e_widget_list_object_append(ol, ow, 1, 1, 0.5);
+   ow = e_widget_label_add(evas, _("Maximum Height"));
+   e_widget_list_object_append(ol, ow, 1, 1, 0.5);
+   ow = e_widget_slider_add(evas, 1, 0, _("%4.0f"), 0, 4000, 50, 0, NULL, 
+                            &(cfdata->pos_max_h), 100);
+   e_widget_list_object_append(ol, ow, 1, 1, 0.5);
+   e_widget_toolbook_page_append(otb, NULL, _("Size Settings"), ol, 
+                                 0, 0, 0, 0, 0.5, 0.0);
+
+   e_widget_toolbook_page_show(otb, 0);
 
-   e_widget_list_object_append(o, ot, 1, 1, 0.5);      
-   return o;   
+   return otb;
 }
 
 /*!
@@ -358,5 +408,5 @@ _cb_disable_check_list(void *data, Evas_Object *obj)
    Evas_Object *o;
 
    EINA_LIST_FOREACH(list, l, o)
-      e_widget_disabled_set(o, !e_widget_check_checked_get(obj));
+     e_widget_disabled_set(o, !e_widget_check_checked_get(obj));
 }