Enlightenment CVS committal Author : titan Project : e17 Module : proto
Dir : e17/proto/ephoto/src Modified Files: ephoto.c ephoto_misc.c ephoto_browsing.c ephoto_presentation.c ephoto.h Log Message: Add an option to zoom every image to fit the window, even if the image is smaller than the window. Minor code cleanups. =================================================================== RCS file: /cvs/e/e17/proto/ephoto/src/ephoto.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -3 -r1.43 -r1.44 --- ephoto.c 18 Apr 2006 03:09:25 -0000 1.43 +++ ephoto.c 13 May 2006 21:06:16 -0000 1.44 @@ -271,14 +271,14 @@ m->win = ewl_window_new(); ewl_window_title_set(EWL_WINDOW(m->win), "ephoto"); ewl_window_name_set(EWL_WINDOW(m->win), "ephoto"); - ewl_object_size_request(EWL_OBJECT(m->win), 640, 500); + ewl_object_size_request(EWL_OBJECT(m->win), 640, 480); ewl_callback_append(m->win, EWL_CALLBACK_DELETE_WINDOW, destroy_cb, NULL); ewl_widget_show(m->win); mainwin = 1; m->avbox = ewl_vbox_new(); ewl_container_child_append(EWL_CONTAINER(m->win), m->avbox); - ewl_object_fill_policy_set(EWL_OBJECT(m->avbox), EWL_FLAG_FILL_ALL); + ewl_object_fill_policy_set(EWL_OBJECT(m->avbox), EWL_FLAG_FILL_ALL | EWL_FLAG_FILL_SHRINK); ewl_widget_show(m->avbox); m->menubar = ewl_hmenubar_new(); @@ -366,21 +366,22 @@ m->hbox = ewl_hpaned_new(); ewl_object_alignment_set(EWL_OBJECT(m->hbox), EWL_FLAG_ALIGN_CENTER); ewl_container_child_append(EWL_CONTAINER(m->avbox), m->hbox); + ewl_object_fill_policy_set(EWL_OBJECT(m->hbox), EWL_FLAG_FILL_ALL | EWL_FLAG_FILL_SHRINK); ewl_widget_show(m->hbox); m->vbox = ewl_vbox_new(); ewl_object_alignment_set(EWL_OBJECT(m->vbox), EWL_FLAG_ALIGN_CENTER); ewl_box_spacing_set(EWL_BOX(m->vbox), 10); - ewl_object_preferred_inner_size_set(EWL_OBJECT(m->vbox), 200, 30); + ewl_object_preferred_inner_size_set(EWL_OBJECT(m->vbox), 200, 45); ewl_container_child_append(EWL_CONTAINER(m->hbox), m->vbox); + ewl_object_fill_policy_set(EWL_OBJECT(m->vbox), EWL_FLAG_FILL_VFILL | EWL_FLAG_FILL_VSHRINK | EWL_FLAG_FILL_HSHRINK); ewl_widget_show(m->vbox); m->images = ewl_border_new(); ewl_border_text_set(EWL_BORDER(m->images), "Add Content"); ewl_border_label_alignment_set(EWL_BORDER(m->images), EWL_FLAG_ALIGN_CENTER); ewl_container_child_append(EWL_CONTAINER(m->vbox), m->images); - ewl_object_maximum_size_set(EWL_OBJECT(m->images), 200, 999999); - ewl_object_fill_policy_set(EWL_OBJECT(m->images), EWL_FLAG_FILL_ALL); + ewl_object_fill_policy_set(EWL_OBJECT(m->images), EWL_FLAG_FILL_VFILL | EWL_FLAG_FILL_VSHRINK); ewl_widget_show(m->images); m->directory = ewl_entry_new(); @@ -398,11 +399,12 @@ m->imagetree = ewl_tree_new(1); ewl_container_child_append(EWL_CONTAINER(m->images), m->imagetree); ewl_object_maximum_size_set(EWL_OBJECT(m->imagetree), 200, 160); + ewl_object_fill_policy_set(EWL_OBJECT(m->imagetree), EWL_FLAG_FILL_VFILL); ewl_widget_show(m->imagetree); m->notebook = ewl_notebook_new(); ewl_notebook_tabbar_position_set(EWL_NOTEBOOK(m->notebook), EWL_POSITION_TOP); - ewl_object_preferred_inner_size_set(EWL_OBJECT(m->notebook), 440, 35); + ewl_object_preferred_inner_size_set(EWL_OBJECT(m->notebook), 440, 45); ewl_container_child_append(EWL_CONTAINER(m->hbox), m->notebook); ewl_object_alignment_set(EWL_OBJECT(m->notebook), EWL_FLAG_ALIGN_CENTER); ewl_object_fill_policy_set(EWL_OBJECT(m->notebook), EWL_FLAG_FILL_ALL); @@ -463,7 +465,6 @@ m->iscroll = ewl_scrollpane_new(); ewl_container_child_append(EWL_CONTAINER(m->content), m->iscroll); - ewl_object_fill_policy_set(EWL_OBJECT(m->iscroll), EWL_FLAG_FILL_ALL); ewl_widget_show(m->iscroll); ewl_container_child_append(EWL_CONTAINER(m->iscroll), m->ib); @@ -474,8 +475,8 @@ ewl_container_child_append(EWL_CONTAINER(m->vbox2), m->settings); ewl_object_alignment_set(EWL_OBJECT(m->settings), EWL_FLAG_ALIGN_CENTER); ewl_box_spacing_set(EWL_BOX(m->settings), 5); - ewl_object_minimum_size_set(EWL_OBJECT(m->settings), 400, 200); - ewl_object_maximum_size_set(EWL_OBJECT(m->settings), 99999, 200); + ewl_object_minimum_size_set(EWL_OBJECT(m->settings), 400, 240); + ewl_object_maximum_size_set(EWL_OBJECT(m->settings), 400, 240); ewl_widget_show(m->settings); m->hboxv = ewl_hbox_new(); @@ -502,7 +503,7 @@ ewl_spinner_value_set(EWL_SPINNER(m->slidetime), 3); } ewl_spinner_min_val_set(EWL_SPINNER(m->slidetime), 1); - ewl_spinner_max_val_set(EWL_SPINNER(m->slidetime), 1000); + ewl_spinner_max_val_set(EWL_SPINNER(m->slidetime), 100000); ewl_container_child_append(EWL_CONTAINER(m->hboxv), m->slidetime); ewl_spinner_step_set(EWL_SPINNER(m->slidetime), 1); ewl_spinner_digits_set(EWL_SPINNER(m->slidetime), 0); @@ -586,6 +587,12 @@ ewl_radiobutton_chain_set(EWL_RADIOBUTTON(m->rad4), EWL_RADIOBUTTON(m->fullrad)); + m->zoom = ewl_checkbutton_new(); + ewl_button_label_set(EWL_BUTTON(m->zoom), "Zoom Images to Fit Window"); + ewl_container_child_append(EWL_CONTAINER(m->settings), m->zoom); + ewl_object_alignment_set(EWL_OBJECT(m->zoom), EWL_FLAG_ALIGN_CENTER); + ewl_widget_show(m->zoom); + m->hboxv = ewl_hbox_new(); ewl_container_child_append(EWL_CONTAINER(m->settings), m->hboxv); ewl_object_alignment_set(EWL_OBJECT(m->hboxv), EWL_FLAG_ALIGN_CENTER); @@ -665,7 +672,6 @@ ewl_widget_show(m->presentation); ewl_widget_disable(m->presentation); - ewl_object_fill_policy_set(EWL_OBJECT(m->vbox), EWL_FLAG_FILL_SHRINK); ewl_object_fill_policy_set(EWL_OBJECT(m->vbox2), EWL_FLAG_FILL_ALL); ewl_object_fill_policy_set(EWL_OBJECT(m->hbox), EWL_FLAG_FILL_ALL); /**********************************************************/ =================================================================== RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_misc.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- ephoto_misc.c 18 Apr 2006 03:09:25 -0000 1.17 +++ ephoto_misc.c 13 May 2006 21:06:16 -0000 1.18 @@ -69,6 +69,7 @@ ewl_entry_editable_set(EWL_ENTRY(m->hsize), 1); } /****************************************************/ + return; } void ephoto_men_cb(Ewl_Widget * w, void *event, void *data) @@ -123,6 +124,8 @@ ewl_object_maximum_size_set(EWL_OBJECT(cancel), 80, 15); ewl_callback_append(cancel, EWL_CALLBACK_CLICKED, destroywin_cb, hwin); ewl_widget_show(cancel); + + return; } void slideshow_save_cb(Ewl_Widget *w, void *event, void *data) @@ -182,6 +185,8 @@ ewl_callback_append(cancel, EWL_CALLBACK_CLICKED, destroywin_cb, m->save_win); ewl_widget_show(cancel); + return; + } void save_cb(Ewl_Widget *w, void *event, void *data) @@ -220,6 +225,7 @@ } ewl_widget_destroy(m->save_win); + return; } void slideshow_load_cb(Ewl_Widget *w, void *event, void *data) { @@ -317,6 +323,8 @@ ewl_object_maximum_size_set(EWL_OBJECT(cancel), 80, 15); ewl_callback_append(cancel, EWL_CALLBACK_CLICKED, destroywin_cb, m->load_win); ewl_widget_show(cancel); + + return; } void loadclicked_cb(Ewl_Widget *w, void *event, void *data) @@ -324,6 +332,7 @@ char *rpath; rpath = ewl_widget_name_get(w); ewl_text_text_set(EWL_TEXT(m->otext), rpath); + return; } void load_cb(Ewl_Widget *w, void *event, void *data) @@ -386,7 +395,8 @@ fclose(file_ptr); } - ewl_widget_destroy(m->load_win); + ewl_widget_destroy(m->load_win); + return; } void create_list_cb(Ewl_Widget *w, void *event, void *data) @@ -417,6 +427,7 @@ } fclose(file_ptr); } + return; } void reseti_cb(Ewl_Widget *w, void *event, void *data) @@ -429,12 +440,14 @@ ewl_freebox_layout_type_set(EWL_FREEBOX(m->ib), EWL_FREEBOX_LAYOUT_AUTO); ewl_container_child_append(EWL_CONTAINER(m->iscroll), m->ib); ewl_widget_show(m->ib); + return; } void reseta_cb(Ewl_Widget *w, void *event, void *data) { ewl_text_text_set(EWL_TEXT(m->atext), ""); audio = 0; + return; } void list_albums_cb(Ewl_Widget *w, void *event, void *data) @@ -450,6 +463,7 @@ path2 = ecore_list_remove_first(albums); printf("%s\n", path2); } + return; } void addi(Ewl_Widget *w, void *event, void *data) @@ -513,5 +527,6 @@ slidenum++; } } + return; } =================================================================== RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_browsing.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -3 -r1.28 -r1.29 --- ephoto_browsing.c 2 May 2006 00:24:19 -0000 1.28 +++ ephoto_browsing.c 13 May 2006 21:06:16 -0000 1.29 @@ -85,8 +85,8 @@ ewl_container_child_append(EWL_CONTAINER(m->images), m->imagetree); ewl_tree_headers_visible_set(EWL_TREE(m->imagetree), 0); ewl_tree_expandable_rows_set(EWL_TREE(m->imagetree), FALSE); - ewl_object_minimum_size_set(EWL_OBJECT(m->imagetree), 200, 230); - ewl_object_maximum_size_set(EWL_OBJECT(m->imagetree), 200, 230); + ewl_object_minimum_size_set(EWL_OBJECT(m->imagetree), 200, 260); + ewl_object_maximum_size_set(EWL_OBJECT(m->imagetree), 200, 260); ewl_object_fill_policy_set(EWL_OBJECT(m->imagetree), EWL_FLAG_FILL_VFILL | EWL_FLAG_FILL_VSHRINK); ewl_widget_show(m->imagetree); =================================================================== RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_presentation.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- ephoto_presentation.c 9 Apr 2006 05:32:58 -0000 1.14 +++ ephoto_presentation.c 13 May 2006 21:06:16 -0000 1.15 @@ -25,30 +25,18 @@ picture1 = ecore_dlist_current(m->imagelist); ewl_widget_destroy(s->screen); - if ( mainwin == 1 ) { - wsize = ewl_text_text_get(EWL_TEXT(m->wsize)); - w = atoi(wsize); - hsize = ewl_text_text_get(EWL_TEXT(m->hsize)); - h = atoi(hsize); - } - if ( mainwin == 0 ) { - w = atoi(argwidth); - h = atoi(argheight); - } s->screen = ewl_image_new(); ewl_image_proportional_set(EWL_IMAGE(s->screen), TRUE); ewl_theme_data_str_set(s->screen, "/image/group", "entry"); ewl_image_file_set(EWL_IMAGE(s->screen), picture1, NULL); ewl_object_alignment_set(EWL_OBJECT(s->screen), EWL_FLAG_ALIGN_CENTER); - if ( mainwin == 1 ) { - if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->fullrad)) == 0 ) { - ewl_object_maximum_size_set(EWL_OBJECT(s->screen), w, h); - } - } - if ( mainwin == 0 && argfullscreen == 0 ) { - ewl_object_maximum_size_set(EWL_OBJECT(s->screen), w, h); - } - ewl_object_fill_policy_set(EWL_OBJECT(s->screen), EWL_FLAG_FILL_SHRINK); + if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->zoom)) == 1 ) { + ewl_object_fill_policy_set(EWL_OBJECT(s->screen), EWL_FLAG_FILL_ALL); + ewl_image_proportional_set(EWL_IMAGE(s->screen), FALSE); + } + else { + ewl_object_fill_policy_set(EWL_OBJECT(s->screen), EWL_FLAG_FILL_SHRINK); + } ewl_container_child_append(EWL_CONTAINER(s->cell), s->screen); ewl_widget_show(s->screen); @@ -64,12 +52,15 @@ s->screen = ewl_image_new(); ewl_image_proportional_set(EWL_IMAGE(s->screen), TRUE); ewl_theme_data_str_set(s->screen, "/image/group", "entry"); - ewl_object_fill_policy_set(EWL_OBJECT(s->screen), EWL_FLAG_FILL_SHRINK); + if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->zoom)) == 1 ) { + ewl_object_fill_policy_set(EWL_OBJECT(s->screen), EWL_FLAG_FILL_ALL); + ewl_image_proportional_set(EWL_IMAGE(s->screen), FALSE); + } + else { + ewl_object_fill_policy_set(EWL_OBJECT(s->screen), EWL_FLAG_FILL_SHRINK); + } ewl_image_file_set(EWL_IMAGE(s->screen), picture2, NULL); ewl_object_alignment_set(EWL_OBJECT(s->screen), EWL_FLAG_ALIGN_CENTER); - if ( argfullscreen == 0 ) { - ewl_object_maximum_size_set(EWL_OBJECT(s->screen), w, h); - } ewl_container_child_append(EWL_CONTAINER(s->cell), s->screen); ewl_widget_show(s->screen); @@ -90,12 +81,15 @@ s->screen = ewl_image_new(); ewl_image_proportional_set(EWL_IMAGE(s->screen), TRUE); ewl_theme_data_str_set(s->screen, "/image/group", "entry"); - ewl_object_fill_policy_set(EWL_OBJECT(s->screen), EWL_FLAG_FILL_SHRINK); + if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->zoom)) == 1 ) { + ewl_object_fill_policy_set(EWL_OBJECT(s->screen), EWL_FLAG_FILL_ALL); + ewl_image_proportional_set(EWL_IMAGE(s->screen), FALSE); + } + else { + ewl_object_fill_policy_set(EWL_OBJECT(s->screen), EWL_FLAG_FILL_SHRINK); + } ewl_image_file_set(EWL_IMAGE(s->screen), picture2, NULL); ewl_object_alignment_set(EWL_OBJECT(s->screen), EWL_FLAG_ALIGN_CENTER); - if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->fullrad)) == 0 ) { - ewl_object_maximum_size_set(EWL_OBJECT(s->screen), w, h); - } ewl_container_child_append(EWL_CONTAINER(s->cell), s->screen); ewl_widget_show(s->screen); } @@ -243,15 +237,13 @@ ewl_theme_data_str_set(s->screen, "/image/group", "entry"); ewl_image_file_set(EWL_IMAGE(s->screen), pic1, NULL); ewl_object_alignment_set(EWL_OBJECT(s->screen), EWL_FLAG_ALIGN_CENTER); - if ( mainwin == 1 ) { - if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->fullrad)) == 0 ) { - ewl_object_maximum_size_set(EWL_OBJECT(s->screen), ws, h); - } - } - if ( mainwin == 0 && argfullscreen == 0 ) { - ewl_object_maximum_size_set(EWL_OBJECT(s->screen), ws, h); - } - ewl_object_fill_policy_set(EWL_OBJECT(s->screen), EWL_FLAG_FILL_SHRINK); + if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->zoom)) == 1 ) { + ewl_object_fill_policy_set(EWL_OBJECT(s->screen), EWL_FLAG_FILL_ALL); + ewl_image_proportional_set(EWL_IMAGE(s->screen), FALSE); + } + else { + ewl_object_fill_policy_set(EWL_OBJECT(s->screen), EWL_FLAG_FILL_SHRINK); + } ewl_container_child_append(EWL_CONTAINER(s->cell), s->screen); ewl_widget_show(s->screen); } @@ -270,7 +262,13 @@ p->imagep = ewl_image_new(); ewl_image_proportional_set(EWL_IMAGE(p->imagep), TRUE); ewl_theme_data_str_set(p->imagep, "/image/group", "entry"); - ewl_object_fill_policy_set(EWL_OBJECT(p->imagep), EWL_FLAG_FILL_SHRINK); + if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->zoom)) == 1 ) { + ewl_object_fill_policy_set(EWL_OBJECT(p->imagep), EWL_FLAG_FILL_ALL); + ewl_image_proportional_set(EWL_IMAGE(p->imagep), FALSE); + } + else { + ewl_object_fill_policy_set(EWL_OBJECT(p->imagep), EWL_FLAG_FILL_SHRINK); + } ewl_image_file_set(EWL_IMAGE(p->imagep), picturep, NULL); ewl_object_alignment_set(EWL_OBJECT(p->imagep), EWL_FLAG_ALIGN_CENTER); ewl_container_child_append(EWL_CONTAINER(p->vboxp), p->imagep); @@ -296,7 +294,13 @@ p->imagep = ewl_image_new(); ewl_image_proportional_set(EWL_IMAGE(p->imagep), TRUE); ewl_theme_data_str_set(p->imagep, "/image/group", "entry"); - ewl_object_fill_policy_set(EWL_OBJECT(p->imagep), EWL_FLAG_FILL_SHRINK); + if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->zoom)) == 1 ) { + ewl_object_fill_policy_set(EWL_OBJECT(p->imagep), EWL_FLAG_FILL_ALL); + ewl_image_proportional_set(EWL_IMAGE(p->imagep), FALSE); + } + else { + ewl_object_fill_policy_set(EWL_OBJECT(p->imagep), EWL_FLAG_FILL_SHRINK); + } ewl_image_file_set(EWL_IMAGE(p->imagep), picturep, NULL); ewl_object_alignment_set(EWL_OBJECT(p->imagep), EWL_FLAG_ALIGN_CENTER); ewl_container_child_append(EWL_CONTAINER(p->vboxp), p->imagep); @@ -321,7 +325,13 @@ p->imagep = ewl_image_new(); ewl_image_proportional_set(EWL_IMAGE(p->imagep), TRUE); ewl_theme_data_str_set(p->imagep, "/image/group", "entry"); - ewl_object_fill_policy_set(EWL_OBJECT(p->imagep), EWL_FLAG_FILL_SHRINK); + if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->zoom)) == 1 ) { + ewl_object_fill_policy_set(EWL_OBJECT(p->imagep), EWL_FLAG_FILL_ALL); + ewl_image_proportional_set(EWL_IMAGE(p->imagep), FALSE); + } + else { + ewl_object_fill_policy_set(EWL_OBJECT(p->imagep), EWL_FLAG_FILL_SHRINK); + } ewl_image_file_set(EWL_IMAGE(p->imagep), picturep, NULL); ewl_object_alignment_set(EWL_OBJECT(p->imagep), EWL_FLAG_ALIGN_CENTER); ewl_container_child_append(EWL_CONTAINER(p->vboxp), p->imagep); @@ -341,7 +351,13 @@ p->imagep = ewl_image_new(); ewl_image_proportional_set(EWL_IMAGE(p->imagep), TRUE); ewl_theme_data_str_set(p->imagep, "/image/group", "entry"); - ewl_object_fill_policy_set(EWL_OBJECT(p->imagep), EWL_FLAG_FILL_SHRINK); + if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->zoom)) == 1 ) { + ewl_object_fill_policy_set(EWL_OBJECT(p->imagep), EWL_FLAG_FILL_ALL); + ewl_image_proportional_set(EWL_IMAGE(p->imagep), FALSE); + } + else { + ewl_object_fill_policy_set(EWL_OBJECT(p->imagep), EWL_FLAG_FILL_SHRINK); + } ewl_image_file_set(EWL_IMAGE(p->imagep), picturep, NULL); ewl_object_alignment_set(EWL_OBJECT(p->imagep), EWL_FLAG_ALIGN_CENTER); ewl_container_child_append(EWL_CONTAINER(p->vboxp), p->imagep); @@ -417,7 +433,13 @@ p->imagep = ewl_image_new(); ewl_theme_data_str_set(p->imagep, "/image/group", "entry"); ewl_image_proportional_set(EWL_IMAGE(p->imagep), TRUE); - ewl_object_fill_policy_set(EWL_OBJECT(p->imagep), EWL_FLAG_FILL_SHRINK); + if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->zoom)) == 1 ) { + ewl_object_fill_policy_set(EWL_OBJECT(p->imagep), EWL_FLAG_FILL_ALL); + ewl_image_proportional_set(EWL_IMAGE(p->imagep), FALSE); + } + else { + ewl_object_fill_policy_set(EWL_OBJECT(p->imagep), EWL_FLAG_FILL_SHRINK); + } ewl_image_file_set(EWL_IMAGE(p->imagep), pictureone, NULL); ewl_object_alignment_set(EWL_OBJECT(p->imagep), EWL_FLAG_ALIGN_CENTER); ewl_container_child_append(EWL_CONTAINER(p->vboxp), p->imagep); =================================================================== RCS file: /cvs/e/e17/proto/ephoto/src/ephoto.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -3 -r1.20 -r1.21 --- ephoto.h 18 Apr 2006 03:09:25 -0000 1.20 +++ ephoto.h 13 May 2006 21:06:16 -0000 1.21 @@ -104,6 +104,7 @@ Ewl_Widget *menu; Ewl_Widget *menu_item; Ewl_Widget *avbox; + Ewl_Widget *zoom; void *data; Ecore_List *imagelist; Ecore_List *presentlist; ------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs