Add Size and Position options to Advanced Config Dialogue for Winlist. Does not follo...

SVN revision: 19539

diff --git a/src/bin/e_int_config_winlist.c b/src/bin/e_int_config_winlist.c
index 2ff6670..d24eca4 100644 (file)
--- a/src/bin/e_int_config_winlist.c
+++ b/src/bin/e_int_config_winlist.c
@@ -1,7 +1,5 @@
 #include "e.h"
 
-/* TODO: Implement Pos Settings */
-
 typedef struct _CFData CFData;
 
 static void        *_create_data(E_Config_Dialog *cfd);
@@ -16,7 +14,6 @@ struct _CFData
    int warp_while_selecting;
    int warp_at_end;
    int scroll_animate;
-
    int list_show_iconified;
    int list_show_other_desk_windows;
    int list_show_other_screen_windows;
@@ -28,8 +25,6 @@ struct _CFData
    /* Advanced */
    double scroll_speed;
    double warp_speed;
-
-   /* TODO */
    double pos_align_x;
    double pos_align_y;
    double pos_size_w;
@@ -177,6 +172,12 @@ _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
    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;
+   e_config->winlist_pos_align_y = cfdata->pos_align_y;
+   e_config->winlist_pos_min_w = cfdata->pos_min_w;
+   e_config->winlist_pos_min_h = cfdata->pos_min_h;
+   e_config->winlist_pos_max_w = cfdata->pos_max_w;
+   e_config->winlist_pos_max_h = cfdata->pos_max_h;
    e_border_button_bindings_grab_all();
    e_config_save_queue();
 
@@ -186,12 +187,15 @@ _advanced_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
 static Evas_Object *
 _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata) 
 {
-   Evas_Object *o, *of, *ob;
+   Evas_Object *o, *of, *ob, *ot;
 
    _fill_data(cfdata);
    
    o = e_widget_list_add(evas, 0, 0);
-   
+   ot = e_widget_table_add(evas, 0);
+
+   /* 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);
@@ -199,7 +203,8 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
    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_list_object_append(o, of, 1, 1, 0.5);   
+   e_widget_table_object_append(ot, of, 0, 0, 1, 1, 1, 1, 1, 1);
+   */   
 
    of = e_widget_framelist_add(evas, _("Selection Settings"), 0);   
    ob = e_widget_check_add(evas, _("Focus window while selecting"), &(cfdata->list_focus_while_selecting));
@@ -212,7 +217,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
    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_list_object_append(o, of, 1, 1, 0.5);   
+   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));
@@ -221,7 +226,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
    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);
    e_widget_framelist_object_append(of, ob);   
-   e_widget_list_object_append(o, of, 1, 1, 0.5);   
+   e_widget_table_object_append(ot, of, 0, 1, 1, 1, 1, 1, 1, 1);
 
    of = e_widget_framelist_add(evas, _("Scroll Settings"), 0);   
    ob = e_widget_check_add(evas, _("Scroll Animate"), &(cfdata->scroll_animate));
@@ -230,9 +235,38 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, CFData *cfdata)
    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);   
-
-   e_widget_list_object_append(o, of, 1, 1, 0.5);   
+   e_widget_table_object_append(ot, of, 0, 2, 1, 1, 1, 1, 1, 1);
    
-   /* TODO: Implement pos settings */
+   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);
+
+   of = e_widget_framelist_add(evas, _("Size Settings"), 0);      
+   ob = e_widget_label_add(evas, _("Minimun 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, _("Minimun 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);
+
+   e_widget_list_object_append(o, ot, 1, 1, 0.5);      
    return o;   
 }