diff --git a/AUTHORS b/AUTHORS index 0db86d5..d9f81a5 100644 --- a/AUTHORS +++ b/AUTHORS @@ -6,6 +6,4 @@ ________/ /__/ /__/ /__/ /_______/ /_/ /_______/ ===Project Manager/Lead Developer=== -Stephen "UnixTitan" Houston -===People That Helped=== -boycott tokyo +Stephen "okra" Houston diff --git a/TODO b/TODO index 797844e..0a6f64d 100644 --- a/TODO +++ b/TODO @@ -10,19 +10,17 @@ TODO- ===Command Line=== Get some command line options going! ===General=== -Dialogs For Adding/Removing Albums/Images. +Album/Image Removal DRAG AND DROP IS A MUST! Keybindings ===Layout=== Ideas and Changes are welcome! ===Normal View=== - -===Edit View=== -Add Editing Controls(Zooms/Color Enhancement/Histogram/Cropping/etc..). -Better Saving Ability(This will include looking into editing and saving exif data). -Should we list navigation for other images better?(than using buttons with arrows) ===Single View=== -Should we list navigation for other images better?(than using buttons with arrwos) +Add Editing Controls(Zooms/Color Enhancement/Histogram/Cropping/etc..). +Better Saving Ability(This will include looking into editing and saving exif data). +Should we list navigation for other images better?(than using buttons with arrows) ===Slideshow=== Need to Add Configuration to Slideshows.. diff --git a/configure.in b/configure.in index de599a2..7d3b28a 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script. rm -f config.cache AC_INIT(configure.in) -AM_INIT_AUTOMAKE(ephoto, 2.15.0) +AM_INIT_AUTOMAKE(ephoto, 3.15.0) AM_CONFIG_HEADER(src/bin/config.h) AC_ISC_POSIX diff --git a/data/images/Makefile.am b/data/images/Makefile.am index 6ac0712..b181b6d 100644 --- a/data/images/Makefile.am +++ b/data/images/Makefile.am @@ -15,10 +15,12 @@ FILES = add.png \ go-down.png \ go-next.png \ image.png \ + in.png \ list_view.png \ media-seek-backward.png \ media-seek-forward.png \ normal_view.png \ + out.png \ photo_lens.png \ preferences-system.png \ redo.png \ diff --git a/data/images/in.png b/data/images/in.png new file mode 100644 index 0000000..62a1e2d Binary files /dev/null and b/data/images/in.png differ diff --git a/data/images/out.png b/data/images/out.png new file mode 100644 index 0000000..0cfd14b Binary files /dev/null and b/data/images/out.png differ diff --git a/data/images/search.png b/data/images/search.png index ca4e4f4..091e97e 100644 Binary files a/data/images/search.png and b/data/images/search.png differ diff --git a/src/bin/ephoto_albums.c b/src/bin/ephoto_albums.c index 81f1e7f..0b19416 100755 --- a/src/bin/ephoto_albums.c +++ b/src/bin/ephoto_albums.c @@ -44,7 +44,7 @@ add_atree(Ewl_Widget *c) ewl_mvc_view_set(EWL_MVC(tree), view); ewl_mvc_selection_mode_set(EWL_MVC(tree), EWL_SELECTION_MODE_SINGLE); ewl_object_fill_policy_set(EWL_OBJECT(tree), EWL_FLAG_FILL_ALL); - ewl_container_child_append(EWL_CONTAINER(c), tree); + ewl_container_child_prepend(EWL_CONTAINER(c), tree); ewl_widget_show(tree); return tree; diff --git a/src/bin/ephoto_normal_view.c b/src/bin/ephoto_normal_view.c index 82bb2b0..68899a2 100644 --- a/src/bin/ephoto_normal_view.c +++ b/src/bin/ephoto_normal_view.c @@ -23,7 +23,7 @@ change_size(Ewl_Widget *w, void *event, void *data) Ewl_Widget * add_normal_view(Ewl_Widget *c) { - Ewl_Widget *box, *button, *hbox, *sp, *vbox; + Ewl_Widget *avbox, *box, *button, *hbox, *image, *sp, *vbox; em->fbox_vbox = add_box(c, EWL_ORIENTATION_VERTICAL, 5); ewl_object_fill_policy_set(EWL_OBJECT(em->fbox_vbox), @@ -36,12 +36,10 @@ add_normal_view(Ewl_Widget *c) ewl_container_child_append(EWL_CONTAINER(em->fbox_vbox), hbox); ewl_widget_show(hbox); - vbox = add_box(hbox, EWL_ORIENTATION_VERTICAL, 2); - ewl_object_fill_policy_set(EWL_OBJECT(vbox), EWL_FLAG_FILL_VFILL); + avbox = add_box(hbox, EWL_ORIENTATION_VERTICAL, 2); + ewl_object_fill_policy_set(EWL_OBJECT(avbox), EWL_FLAG_FILL_VFILL); - show_albums(vbox); - - box = add_box(vbox, EWL_ORIENTATION_HORIZONTAL, 2); + box = add_box(avbox, EWL_ORIENTATION_HORIZONTAL, 2); ewl_object_fill_policy_set(EWL_OBJECT(box), EWL_FLAG_FILL_SHRINK); button = add_button(box, "Import", PACKAGE_DATA_DIR "/images/add.png", @@ -65,17 +63,28 @@ add_normal_view(Ewl_Widget *c) ewl_container_child_append(EWL_CONTAINER(sp), em->fbox); ewl_widget_show(em->fbox); + box = add_box(vbox, EWL_ORIENTATION_HORIZONTAL, 10); + ewl_object_fill_policy_set(EWL_OBJECT(box), EWL_FLAG_FILL_SHRINK); + + image = add_image(box, PACKAGE_DATA_DIR "/images/image.png", 0, NULL, NULL); + ewl_image_constrain_set(EWL_IMAGE(image), 20); + em->fthumb_size = ewl_hseeker_new(); ewl_range_minimum_value_set(EWL_RANGE(em->fthumb_size), 16); ewl_range_maximum_value_set(EWL_RANGE(em->fthumb_size), 144); ewl_range_step_set(EWL_RANGE(em->fthumb_size), 16); ewl_range_value_set(EWL_RANGE(em->fthumb_size), 80); - ewl_container_child_append(EWL_CONTAINER(vbox), em->fthumb_size); + ewl_container_child_append(EWL_CONTAINER(box), em->fthumb_size); ewl_callback_append(em->fthumb_size, EWL_CALLBACK_VALUE_CHANGED, change_size, NULL); ewl_object_maximum_size_set(EWL_OBJECT(em->fthumb_size), 160, 40); ewl_widget_show(em->fthumb_size); + show_albums(avbox); + + image = add_image(box, PACKAGE_DATA_DIR "/images/image.png", 0, NULL, NULL); + ewl_image_constrain_set(EWL_IMAGE(image), 32); + return em->fbox_vbox; } diff --git a/src/bin/ephoto_single_view.c b/src/bin/ephoto_single_view.c index d20a632..aef9e82 100644 --- a/src/bin/ephoto_single_view.c +++ b/src/bin/ephoto_single_view.c @@ -117,12 +117,12 @@ add_standard_edit_tools(Ewl_Widget *c) { Ewl_Widget *image; - image = add_image(c, PACKAGE_DATA_DIR "/images/search.png", 0, zoom_in, + image = add_image(c, PACKAGE_DATA_DIR "/images/in.png", 0, zoom_in, NULL); ewl_image_size_set(EWL_IMAGE(image), 25, 25); ewl_object_alignment_set(EWL_OBJECT(image), EWL_FLAG_ALIGN_LEFT); - image = add_image(c, PACKAGE_DATA_DIR "/images/search.png", 0, zoom_out, + image = add_image(c, PACKAGE_DATA_DIR "/images/out.png", 0, zoom_out, NULL); ewl_image_size_set(EWL_IMAGE(image), 25, 25); ewl_object_alignment_set(EWL_OBJECT(image), EWL_FLAG_ALIGN_LEFT);