diff --git a/AUTHORS b/AUTHORS index b0f2e0b..28b23d1 100644 --- a/AUTHORS +++ b/AUTHORS @@ -6,7 +6,7 @@ ________/ /__/ /__/ /__/ /_______/ /_/ /_______/ ===Project Manager/Lead Developer=== -Stephen "okra" Houston +Stephen "okra" Houston ===Developers=== Gustavo Sverzut Barbieri diff --git a/COPYING b/COPYING index a5063f4..be1b337 100644 --- a/COPYING +++ b/COPYING @@ -1,6 +1,3 @@ -Icons from the faenza project (http://tiheum.deviantart.com/art/Faenza-Icons-173323228) -For information see COPYING.icons - Copyright (C) 2000-2011 Stephen Houston All rights reserved. diff --git a/NEWS b/NEWS index e7714bc..5f4b7dc 100644 --- a/NEWS +++ b/NEWS @@ -6,4 +6,4 @@ ________/ /__/ /__/ /__/ /_______/ /_/ /_______/ -New ephoto has been added to e/trunk/ephoto in svn. +Ephoto is located in git at apps/ephoto. diff --git a/README b/README index 7007ee3..0236e99 100644 --- a/README +++ b/README @@ -8,4 +8,3 @@ ________/ /__/ /__/ /__/ /_______/ /_/ /_______/ Ephoto Image Viewer/Editor/Manipulator/Slideshow creator. -Icons belong to the faenza project (http://tiheum.deviantart.com/art/Faenza-Icons-173323228) diff --git a/TODO b/TODO index b61e35d..e872485 100644 --- a/TODO +++ b/TODO @@ -7,20 +7,22 @@ ________/ /__/ /__/ /__/ /_______/ /_/ /_______/ TODO- +===Config=================== +Make the config system work better loading and saving config. +Add options to the config. +Add a config dialog. ===Thumb Browser============ Add a way to view more info ============================ ===Single Image Mode======== -Rotate Images. -Flip Images. --Possibly Grayscale, Sepia, etc..? --Possibly HSV, Brightness, Contrast, RGB, etc..? --Magnifier and color chooser +Make rotations and flips work +Add neat effects like grayscale, sepia, HSV/RGB, etc... +Save changes made to images ============================ ===Slideshow================ --Slideshow features. +-Slideshow features such as changing transition and possibly moving images. ============================ ===Other Random Features==== -Exporting to flickr, facebook, etc.. --Possibly a tag system? +-Read straight from a camera ============================ diff --git a/configure.ac b/configure.ac index 9fab3af..34376c6 100644 --- a/configure.ac +++ b/configure.ac @@ -84,8 +84,6 @@ AC_SUBST(LTLIBINTL) PKG_CHECK_MODULES([ELEMENTARY], [elementary ecore-file ethumb_client]) PKG_CHECK_MODULES([EFREET_MIME], [efreet-mime]) -PKG_CHECK_MODULES([EIO], [eio]) -PKG_CHECK_MODULES([EET], [eet]) AC_ARG_ENABLE([libexif], [AC_HELP_STRING([--enable-libexif], [enable libexif support @<:@default=yes@:>@])], @@ -99,7 +97,6 @@ AC_ARG_ENABLE([libexif], [_ephoto_enable_libexif="yes"] ) -AC_MSG_CHECKING([whether ethumb is built]) AC_MSG_RESULT([${_ephoto_enable_libexif}]) have_libexif="No" @@ -113,14 +110,6 @@ if test "x${_ephoto_enable_libexif}" = "xyes" ; then ]) fi -AC_ARG_WITH([edje-cc], - [AC_HELP_STRING([--with-edje-cc=PATH], - [specify a specific path to edje_cc])], - [edje_cc=$withval; - AC_MSG_NOTICE([edje_cc explicitly set to $edje_cc]) - ],[edje_cc=$(pkg-config --variable=prefix edje)/bin/edje_cc]) -AC_SUBST(edje_cc) - want_quicklaunch="auto" AC_ARG_ENABLE([quicklaunch], [AC_HELP_STRING([--disable-quicklaunch], @@ -164,10 +153,6 @@ Makefile ephoto.spec data/Makefile data/desktop/Makefile -data/images/Makefile -data/themes/Makefile -data/themes/default/Makefile -data/themes/default/images/Makefile src/Makefile src/bin/Makefile $po_makefile_in diff --git a/data/Makefile.am b/data/Makefile.am index b9e3741..d4cb353 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,2 +1,2 @@ MAINTAINERCLEANFILES = Makefile.in Makefile -SUBDIRS = desktop images themes +SUBDIRS = desktop diff --git a/data/images/Makefile.am b/data/images/Makefile.am deleted file mode 100644 index 262fb9f..0000000 --- a/data/images/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in Makefile - -IMAGES = \ -*.png - -imagesdir = $(pkgdatadir)/images -images_DATA = $(IMAGES) - -EXTRA_DIST = $(IMAGES) diff --git a/data/images/back.png b/data/images/back.png deleted file mode 100644 index 964d853..0000000 Binary files a/data/images/back.png and /dev/null differ diff --git a/data/images/back_grid.png b/data/images/back_grid.png deleted file mode 100644 index a19eabd..0000000 Binary files a/data/images/back_grid.png and /dev/null differ diff --git a/data/images/first.png b/data/images/first.png deleted file mode 100644 index 0c99ca1..0000000 Binary files a/data/images/first.png and /dev/null differ diff --git a/data/images/folder.png b/data/images/folder.png deleted file mode 100644 index 64e2f53..0000000 Binary files a/data/images/folder.png and /dev/null differ diff --git a/data/images/forward.png b/data/images/forward.png deleted file mode 100644 index 3e4516c..0000000 Binary files a/data/images/forward.png and /dev/null differ diff --git a/data/images/grid.png b/data/images/grid.png deleted file mode 100644 index 19353bd..0000000 Binary files a/data/images/grid.png and /dev/null differ diff --git a/data/images/last.png b/data/images/last.png deleted file mode 100644 index 78825d8..0000000 Binary files a/data/images/last.png and /dev/null differ diff --git a/data/images/single.png b/data/images/single.png deleted file mode 100644 index ef05423..0000000 Binary files a/data/images/single.png and /dev/null differ diff --git a/data/images/slideshow.png b/data/images/slideshow.png deleted file mode 100644 index 77f9365..0000000 Binary files a/data/images/slideshow.png and /dev/null differ diff --git a/data/images/up.png b/data/images/up.png deleted file mode 100644 index 9d1cbe4..0000000 Binary files a/data/images/up.png and /dev/null differ diff --git a/data/images/zoom-fit.png b/data/images/zoom-fit.png deleted file mode 100644 index b253d22..0000000 Binary files a/data/images/zoom-fit.png and /dev/null differ diff --git a/data/images/zoom-in.png b/data/images/zoom-in.png deleted file mode 100644 index dc53d9e..0000000 Binary files a/data/images/zoom-in.png and /dev/null differ diff --git a/data/images/zoom-original.png b/data/images/zoom-original.png deleted file mode 100644 index de57e90..0000000 Binary files a/data/images/zoom-original.png and /dev/null differ diff --git a/data/images/zoom-out.png b/data/images/zoom-out.png deleted file mode 100644 index 295b7ef..0000000 Binary files a/data/images/zoom-out.png and /dev/null differ diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am deleted file mode 100644 index 6e75f6c..0000000 --- a/data/themes/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -## Process this file with automake to produce Makefile.in - -MAINTAINERCLEANFILES = Makefile.in Makefile - -SUBDIRS = default diff --git a/data/themes/default/Makefile.am b/data/themes/default/Makefile.am deleted file mode 100644 index bd6f02c..0000000 --- a/data/themes/default/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -SUBDIRS = images - -EDCS = ephoto.edc -EDJS = $(EDCS:%.edc=%.edj) - -ephoto_DEPS = ephoto.edc - -EXTRA_DIST = $(EDCS) - -CLEANFILES = $(EDJS) - -themedir = $(pkgdatadir)/themes/default -theme_DATA = $(EDJS) - -all: $(EDJS) - -ephoto.edj: ${ephoto_DEPS} - -SUFFIXES = .edc .edj -.edc.edj: - $(edje_cc) -id $(top_srcdir)/data/themes/default/images -fd $(top_srcdir)/data/themes/default/fonts $< $(top_builddir)/data/themes/default/$(@F) diff --git a/data/themes/default/ephoto.edc b/data/themes/default/ephoto.edc deleted file mode 100644 index 4cc7b05..0000000 --- a/data/themes/default/ephoto.edc +++ /dev/null @@ -1,603 +0,0 @@ -externals { - external: "elm"; -} - -collections { - group { name: "elm/layout/ephoto/orient"; - parts { - part { name: "elm.swallow.content"; - type: SWALLOW; - description { state: "default" 0.0; - } - description { state: "rotate_0" 0.0; - inherit: "default" 0.0; - map { - on: 1; - rotation.z: 0; - } - } - description { state: "rotate_90" 0.0; - inherit: "default" 0.0; - map { - on: 1; - rotation.z: 90; - } - } - description { state: "rotate_180" 0.0; - inherit: "default" 0.0; - map { - on: 1; - rotation.z: 180; - } - } - description { state: "rotate_270" 0.0; - inherit: "default" 0.0; - map { - on: 1; - rotation.z: 270; - } - } - description { state: "flip_horiz" 0.0; - inherit: "default" 0.0; - map { - on: 1; - rotation.y: 180; - } - } - description { state: "flip_vert" 0.0; - inherit: "default" 0.0; - map { - on: 1; - rotation.x: 180; - } - } - description { state: "flip_horiz_90" 0.0; - inherit: "default" 0.0; - map { - on: 1; - rotation { - z: 90; - y: 180; - } - } - } - description { state: "flip_vert_90" 0.0; - inherit: "default" 0.0; - map { - on: 1; - rotation { - z: 90; - x: 180; - } - } - } - } - programs { - program { - signal: "state,rotate,0"; - source: "ephoto"; - action: STATE_SET "rotate_0" 0.0; - target: "elm.swallow.content"; - } - program { - signal: "state,rotate,90"; - source: "ephoto"; - action: STATE_SET "rotate_90" 0.0; - target: "elm.swallow.content"; - } - program { - signal: "state,rotate,180"; - source: "ephoto"; - action: STATE_SET "rotate_180" 0.0; - target: "elm.swallow.content"; - } - program { - signal: "state,rotate,270"; - source: "ephoto"; - action: STATE_SET "rotate_270" 0.0; - target: "elm.swallow.content"; - } - program { - signal: "state,flip,horiz"; - source: "ephoto"; - action: STATE_SET "flip_horiz" 0.0; - target: "elm.swallow.content"; - } - program { - signal: "state,flip,vert"; - source: "ephoto"; - action: STATE_SET "flip_vert" 0.0; - target: "elm.swallow.content"; - } - program { - signal: "state,flip,horiz,90"; - source: "ephoto"; - action: STATE_SET "flip_horiz_90" 0.0; - target: "elm.swallow.content"; - } - program { - signal: "state,flip,vert,90"; - source: "ephoto"; - action: STATE_SET "flip_vert_90" 0.0; - target: "elm.swallow.content"; - } - } - } - } - group { name: "elm/gengrid/item/ephoto-album-preview/default"; - data.item: "texts" "elm.text"; - data.item: "icons" "elm.swallow.icon.1 elm.swallow.icon.2 elm.swallow.icon.3"; - data.item: "states" "have_files"; - images { - image: "bt_sm_base1.png" COMP; - image: "bt_sm_shine.png" COMP; - image: "bt_sm_hilight.png" COMP; - image: "directory-512.png" COMP; - } - parts { - part { name: "event"; - type: RECT; - repeat_events: 1; - description { state: "default" 0.0; - color: 0 0 0 0; - } - } - part { name: "bg"; - clip_to: "disclip"; - mouse_events: 0; - description { state: "default" 0.0; - visible: 0; - color: 255 255 255 0; - rel1.offset: -3 -3; - rel2.offset: 2 2; - image { - normal: "bt_sm_base1.png"; - border: 6 6 6 6; - middle: SOLID; - } - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 255; - } - } - part { name: "image"; - type: IMAGE; - mouse_events: 0; - description { state: "default" 0.0; - aspect_preference: BOTH; - aspect: 1.0 1.0; - image.normal: "directory-512.png"; - rel2 { - to_y: "elm.text"; - relative: 1.0 0.0; - offset: -1 -2; - } - } - } - part { name: "have-files-clipper"; - type: RECT; - description { state: "default" 0.0; - color: 255 255 255 0; - visible: 0; - } - description { state: "visible" 0.0; - inherit: "default" 0.0; - color: 255 255 255 255; - visible: 1; - } - } - part { name: "icon_box_margin"; - type: RECT; - mouse_events: 0; - clip_to: "have-files-clipper"; - description { state: "default" 0.0; - color: 255 255 255 0; - rel1 { - to: "icon_box"; - offset: -1 -1; - } - rel2 { - to: "icon_box"; - offset: 0 0; - } - } - } - part { name: "icon_box"; - type: RECT; - mouse_events: 0; - clip_to: "have-files-clipper"; - description { state: "default" 0.0; - color: 255 255 255 0; - align: 1.0 1.0; - min: 32 32; - - rel1 { - to: "image"; - relative: 0.0 0.0; - offset: 0 20; - } - rel2 { - to: "image"; - relative: 1.0 1.0; - offset: -1 -1; - } - } - } - part { name: "elm.swallow.icon.1"; - type: SWALLOW; - mouse_events: 0; - clip_to: "have-files-clipper"; - description { state: "default" 0.0; - color: 255 0 0 255; - map { - on: 0; - rotation { - z: 0; - } - } - rel1 { - relative: 0.2 0.2; - to: "icon_box"; - } - rel2 { - relative: 0.8 0.8; - offset: -1 -1; - to: "icon_box"; - } - } - } - part { name: "elm.swallow.icon.2"; - type: SWALLOW; - mouse_events: 0; - clip_to: "have-files-clipper"; - description { state: "default" 0.0; - color: 255 0 0 255; - map { - on: 1; - rotation { - z: 15; - } - } - rel1 { - relative: 0.2 0.2; - to: "icon_box"; - } - rel2 { - relative: 0.8 0.8; - offset: -1 -1; - to: "icon_box"; - } - } - } - part { name: "elm.swallow.icon.3"; - type: SWALLOW; - mouse_events: 0; - clip_to: "have-files-clipper"; - description { state: "default" 0.0; - color: 255 0 0 255; - map { - on: 1; - rotation { - z: -15; - } - } - rel1 { - relative: 0.2 0.2; - to: "icon_box"; - } - rel2 { - relative: 0.8 0.8; - offset: -1 -1; - to: "icon_box"; - } - } - } - part { name: "elm.text"; - clip_to: "disclip"; - type: TEXT; - effect: SOFT_SHADOW; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - rel1 { - relative: 0.0 1.0; - offset: 20 -30; - } - rel2 { - relative: 1.0 1.0; - offset: -21 -15; - } - color: 0 0 0 255; - color3: 0 0 0 0; - text { - font: "Sans"; - size: 10; - min: 0 1; - align: 0.5 0.0; - text_class: "grid_item"; - } - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - color: 255 255 255 255; - } - } - part { name: "fg1"; - clip_to: "disclip"; - mouse_events: 0; - description { state: "default" 0.0; - visible: 0; - color: 255 255 255 0; - rel1.offset: -3 -3; - rel2 { - relative: 1.0 0.5; - offset: 2 -1; - } - image { - normal: "bt_sm_hilight.png"; - border: 6 6 6 0; - } - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 255; - } - } - part { name: "fg2"; - clip_to: "disclip"; - mouse_events: 0; - description { state: "default" 0.0; - visible: 0; - color: 255 255 255 0; - rel1.offset: -3 -3; - rel2.offset: 2 2; - image { - normal: "bt_sm_shine.png"; - border: 6 6 6 0; - } - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 255; - } - } - part { name: "disclip"; - type: RECT; - description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 255 255 255 64; - } - } - } - programs { - program { name: "load"; - signal: "load"; - // script { - // new Float:val; - // custom_state(PART:"elm.swallow.icon.3", "default", 0.0); - // custom_state(PART:"elm.swallow.icon.1", "default", 0.0); - // val = randf(); - // val = 40 * val - 20; - // set_state_val(PART:"elm.swallow.icon.3", STATE_MAP_ROT_Z, val); - // val = randf(); - // val = 40 * val - 20; - // set_state_val(PART:"elm.swallow.icon.1", STATE_MAP_ROT_Z, val); - //set_state(PART:"elm.swallow.icon.1", "custom", 0.0); - // set_state(PART:"elm.swallow.icon.3", "custom", 0.0); - //} - } - program { name: "go_active"; - signal: "elm,state,selected"; - source: "elm"; - action: STATE_SET "selected" 0.0; - target: "bg"; - target: "fg1"; - target: "fg2"; - target: "elm.text"; - } - program { name: "go_passive"; - signal: "elm,state,unselected"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "bg"; - target: "fg1"; - target: "fg2"; - target: "elm.text"; - transition: LINEAR 0.1; - } - program { name: "go_disabled"; - signal: "elm,state,disabled"; - source: "elm"; - action: STATE_SET "disabled" 0.0; - target: "disclip"; - } - program { name: "go_enabled"; - signal: "elm,state,enabled"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "disclip"; - } - program { - signal: "elm,state,have_files,active"; - source: "elm"; - action: STATE_SET "visible" 0.0; - target: "have-files-clipper"; - } - } - } - group { name: "elm/gengrid/item/ephoto-up/default"; - data.item: "texts" "elm.text"; - images { - image: "bt_sm_base1.png" COMP; - image: "bt_sm_shine.png" COMP; - image: "bt_sm_hilight.png" COMP; - image: "directory-up-512.png" COMP; - } - parts { - part { name: "event"; - type: RECT; - repeat_events: 1; - description { state: "default" 0.0; - color: 0 0 0 0; - } - } - part { name: "bg"; - clip_to: "disclip"; - mouse_events: 0; - description { state: "default" 0.0; - visible: 0; - color: 255 255 255 0; - rel1.offset: -3 -3; - rel2.offset: 2 2; - image { - normal: "bt_sm_base1.png"; - border: 6 6 6 6; - middle: SOLID; - } - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 255; - } - } - part { name: "image"; - type: IMAGE; - mouse_events: 0; - description { state: "default" 0.0; - aspect_preference: BOTH; - aspect: 1.0 1.0; - image.normal: "directory-up-512.png"; - rel2 { - to_y: "elm.text"; - relative: 1.0 0.0; - offset: -1 -2; - } - } - } - part { name: "elm.text"; - clip_to: "disclip"; - type: TEXT; - effect: SOFT_SHADOW; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - rel1 { - relative: 0.0 1.0; - offset: 20 -30; - } - rel2 { - relative: 1.0 1.0; - offset: -21 -15; - } - color: 0 0 0 255; - color3: 0 0 0 0; - text { - font: "Sans"; - size: 10; - min: 0 1; - align: 0.5 0.0; - text_class: "grid_item"; - } - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - color: 255 255 255 255; - } - } - part { name: "fg1"; - clip_to: "disclip"; - mouse_events: 0; - description { state: "default" 0.0; - visible: 0; - color: 255 255 255 0; - rel1.offset: -3 -3; - rel2 { - relative: 1.0 0.5; - offset: 2 -1; - } - image { - normal: "bt_sm_hilight.png"; - border: 6 6 6 0; - } - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 255; - } - } - part { name: "fg2"; - clip_to: "disclip"; - mouse_events: 0; - description { state: "default" 0.0; - visible: 0; - color: 255 255 255 0; - rel1.offset: -3 -3; - rel2.offset: 2 2; - image { - normal: "bt_sm_shine.png"; - border: 6 6 6 0; - } - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 255; - } - } - part { name: "disclip"; - type: RECT; - description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 255 255 255 64; - } - } - } - programs { - program { name: "go_active"; - signal: "elm,state,selected"; - source: "elm"; - action: STATE_SET "selected" 0.0; - target: "bg"; - target: "fg1"; - target: "fg2"; - target: "elm.text"; - } - program { name: "go_passive"; - signal: "elm,state,unselected"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "bg"; - target: "fg1"; - target: "fg2"; - target: "elm.text"; - transition: LINEAR 0.1; - } - program { name: "go_disabled"; - signal: "elm,state,disabled"; - source: "elm"; - action: STATE_SET "disabled" 0.0; - target: "disclip"; - } - program { name: "go_enabled"; - signal: "elm,state,enabled"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "disclip"; - } - } - } -} diff --git a/data/themes/default/fonts/Vera.ttf b/data/themes/default/fonts/Vera.ttf deleted file mode 100644 index 58cd6b5..0000000 Binary files a/data/themes/default/fonts/Vera.ttf and /dev/null differ diff --git a/data/themes/default/images/Makefile.am b/data/themes/default/images/Makefile.am deleted file mode 100644 index b458326..0000000 --- a/data/themes/default/images/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = \ -*.png diff --git a/data/themes/default/images/bt_sm_base1.png b/data/themes/default/images/bt_sm_base1.png deleted file mode 100644 index c37e182..0000000 Binary files a/data/themes/default/images/bt_sm_base1.png and /dev/null differ diff --git a/data/themes/default/images/bt_sm_hilight.png b/data/themes/default/images/bt_sm_hilight.png deleted file mode 100644 index 63899ca..0000000 Binary files a/data/themes/default/images/bt_sm_hilight.png and /dev/null differ diff --git a/data/themes/default/images/bt_sm_shine.png b/data/themes/default/images/bt_sm_shine.png deleted file mode 100644 index 23bf311..0000000 Binary files a/data/themes/default/images/bt_sm_shine.png and /dev/null differ diff --git a/data/themes/default/images/directory-512.png b/data/themes/default/images/directory-512.png deleted file mode 100644 index 7beeb3d..0000000 Binary files a/data/themes/default/images/directory-512.png and /dev/null differ diff --git a/data/themes/default/images/directory-up-512.png b/data/themes/default/images/directory-up-512.png deleted file mode 100644 index fc860e2..0000000 Binary files a/data/themes/default/images/directory-up-512.png and /dev/null differ diff --git a/ephoto.spec.in b/ephoto.spec.in index 6c39636..d76f41d 100644 --- a/ephoto.spec.in +++ b/ephoto.spec.in @@ -6,8 +6,8 @@ License: BSD Group: Applications/Multimedia URL: http://www.stephen.3sixty8.com Source: %{name}-%{version}.tar.gz -Packager: %{?_packager:%{_packager}}%{!?_packager:Stephen Houston } -Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:Okra Project (http://www.stephen.3sixty8.com/)} +Packager: %{?_packager:%{_packager}}%{!?_packager:Stephen Houston } +Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:Okra Project (http://www.smhouston.us/)} Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}} #BuildSuggests: xorg-x11-devel Requires: efl edje ethumb diff --git a/po/POTFILES.in b/po/POTFILES.in index e6928e2..9c1ac2a 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,7 +1,6 @@ src/bin/ephoto.c src/bin/ephoto_config.c src/bin/ephoto_main.c -src/bin/ephoto_directory_thumb.c src/bin/ephoto_thumb_browser.c src/bin/ephoto_single_browser.c src/bin/ephoto_slideshow.c diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index acf6b58..5718f60 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -6,7 +6,7 @@ INCLUDES = \ -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ -DGETTEXT_PACKAGE=\"$(PACKAGE)\" \ -DLOCALEDIR=\"$(localedir)\" \ - @ELEMENTARY_CFLAGS@ @EFREET_MIME_CFLAGS@ @EIO_CFLAGS@ @EXIF_CFLAGS@ @EET_CFLAGS@ + @ELEMENTARY_CFLAGS@ @EFREET_MIME_CFLAGS@ @EXIF_CFLAGS@ bin_PROGRAMS = ephoto if BUILD_QUICKLAUNCH @@ -17,13 +17,12 @@ _sources = \ ephoto.c \ ephoto_main.c \ ephoto_config.c \ - ephoto_directory_thumb.c \ ephoto_thumb_browser.c \ ephoto_single_browser.c \ ephoto_slideshow.c -_libs = @ELEMENTARY_LIBS@ @EFREET_MIME_LIBS@ @EIO_LIBS@ @EXIF_LIBS@ @EET_LIBS@ +_libs = @ELEMENTARY_LIBS@ @EFREET_MIME_LIBS@ @EXIF_LIBS@ ephoto_SOURCES = $(_sources) ephoto_LDADD = $(_libs) diff --git a/src/bin/ephoto.c b/src/bin/ephoto.c index 9318a9d..c2dc80a 100644 --- a/src/bin/ephoto.c +++ b/src/bin/ephoto.c @@ -37,8 +37,6 @@ elm_main(int argc, char **argv) goto end_log_domain; } - elm_theme_extension_add(NULL, PACKAGE_DATA_DIR"/themes/default/ephoto.edj"); - if (!efreet_mime_init()) ERR("Could not init efreet_mime!"); diff --git a/src/bin/ephoto.h b/src/bin/ephoto.h index 3555fe7..04e5530 100644 --- a/src/bin/ephoto.h +++ b/src/bin/ephoto.h @@ -22,8 +22,6 @@ #include #include -#define THEME_FILE PACKAGE_DATA_DIR"/themes/default/ephoto.edj" - typedef struct _Ephoto_Config Ephoto_Config; typedef struct _Ephoto Ephoto; typedef struct _Ephoto_Entry Ephoto_Entry; @@ -58,8 +56,6 @@ void ephoto_slideshow_entry_set(Evas_Object *obj, Ephoto_Entry *entry); * "back" - the user want to go back to the previous screen. */ -Evas_Object *ephoto_directory_thumb_add(Evas_Object *parent, Ephoto_Entry *e); - Evas_Object *ephoto_thumb_browser_add(Ephoto *ephoto, Evas_Object *parent); /* smart callbacks called: @@ -143,8 +139,6 @@ struct _Ephoto_Entry Ephoto *ephoto; Elm_Object_Item *item; Eina_List *free_listeners; - Eina_List *dir_files; /* if dir, here contain files with preview */ - Eina_Bool dir_files_checked : 1; Eina_Bool is_dir : 1; Eina_Bool is_up : 1; }; diff --git a/src/bin/ephoto_directory_thumb.c b/src/bin/ephoto_directory_thumb.c deleted file mode 100644 index eeda248..0000000 --- a/src/bin/ephoto_directory_thumb.c +++ /dev/null @@ -1,176 +0,0 @@ -#include "ephoto.h" - -typedef struct _Ephoto_Directory_Thumb Ephoto_Directory_Thumb; -struct _Ephoto_Directory_Thumb -{ - Eio_File *ls; - Eina_List *objs; - Ephoto_Entry *entry; - Eina_Bool canceled:1; -}; - -static Eina_Hash *_pending_dirs = NULL; - -static void -_entry_free(void *data, const Ephoto_Entry *entry __UNUSED__) -{ - Ephoto_Directory_Thumb *dt = data; - dt->entry = NULL; -} - -static void -_ephoto_directory_thumb_free(Ephoto_Directory_Thumb *dt) -{ - if (dt->entry) - { - ephoto_entry_free_listener_del(dt->entry, _entry_free, dt); - eina_hash_del(_pending_dirs, dt->entry->path, dt); - dt->entry = NULL; - } - - if (dt->ls) - { - dt->canceled = EINA_TRUE; - eio_file_cancel(dt->ls); - return; - } - - free(dt); - - if (_pending_dirs) - { - if (!eina_hash_population(_pending_dirs)) - { - eina_hash_free(_pending_dirs); - _pending_dirs = NULL; - } - } -} - -static void -_obj_del(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) -{ - Ephoto_Directory_Thumb *dt = data; - dt->objs = eina_list_remove(dt->objs, obj); - if (!dt->objs) - { - dt->canceled = EINA_TRUE; - _ephoto_directory_thumb_free(dt); - } -} - -static Eina_Bool -_populate_filter(void *data __UNUSED__, Eio_File *handler __UNUSED__, const Eina_File_Direct_Info *info) -{ - return _ephoto_eina_file_direct_info_image_useful(info); -} - -static void -_populate_end(void *data, Eio_File *handler __UNUSED__) -{ - Ephoto_Directory_Thumb *dt = data; - Evas_Object *obj; - dt->ls = NULL; - - EINA_LIST_FREE(dt->objs, obj) - evas_object_event_callback_del_full(obj, EVAS_CALLBACK_DEL, _obj_del, dt); - - if (dt->entry) - { - dt->entry->dir_files_checked = EINA_TRUE; - if ((dt->entry->item) && (!dt->canceled)) - elm_gengrid_item_update(dt->entry->item); - } - - _ephoto_directory_thumb_free(dt); -} - -static void -_populate_error(void *data, Eio_File *handler, int error) -{ - Ephoto_Directory_Thumb *dt = data; - if (error) ERR("could not populate: %s", strerror(error)); - _populate_end(dt, handler); -} - -static void -_populate_main(void *data, Eio_File *handler __UNUSED__, const Eina_File_Direct_Info *info) -{ - Ephoto_Directory_Thumb *dt = data; - Evas_Object *obj; - const char *file; - - if (!dt->objs) return; - if (!dt->entry) return; - - obj = dt->objs->data; - file = eina_stringshare_add(info->path); - - DBG("populate thumbnail %p with path '%s'", obj, file); - - dt->objs = eina_list_remove_list(dt->objs, dt->objs); - dt->entry->dir_files = eina_list_append(dt->entry->dir_files, file); - ephoto_thumb_path_set(obj, file); - - evas_object_event_callback_del_full(obj, EVAS_CALLBACK_DEL, _obj_del, dt); - if ((!dt->objs) && (dt->ls)) - { - eio_file_cancel(dt->ls); - dt->ls = NULL; - } -} - -Evas_Object * -ephoto_directory_thumb_add(Evas_Object *parent, Ephoto_Entry *entry) -{ - Ephoto_Directory_Thumb *dt; - Evas_Object *obj; - - if (_pending_dirs) - dt = eina_hash_find(_pending_dirs, entry->path); - else - { - dt = NULL; - _pending_dirs = eina_hash_stringshared_new(NULL); - EINA_SAFETY_ON_NULL_RETURN_VAL(_pending_dirs, NULL); - } - - obj = ephoto_thumb_add(entry->ephoto, parent, NULL); - EINA_SAFETY_ON_NULL_RETURN_VAL(obj, NULL); - - if (!dt) - { - dt = calloc(1, sizeof(Ephoto_Directory_Thumb)); - if (!dt) - { - ERR("could not allocate memory for Ephoto_Directory_Thumb"); - evas_object_del(obj); - return NULL; - } - ephoto_entry_free_listener_add(entry, _entry_free, dt); - dt->entry = entry; - dt->ls = eio_file_direct_ls(entry->path, - _populate_filter, - _populate_main, - _populate_end, - _populate_error, - dt); - if (!dt->ls) - { - ERR("could not create eio_file_direct_ls(%s)", entry->path); - evas_object_del(obj); - free(dt); - return NULL; - } - - eina_hash_add(_pending_dirs, entry->path, dt); - DBG("start thread to lookup inside '%s' for thumbnails.", entry->path); - } - else - DBG("thread already started, wait for thumbnails in '%s'", entry->path); - - dt->objs = eina_list_append(dt->objs, obj); - - evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL, _obj_del, dt); - return obj; -} diff --git a/src/bin/ephoto_main.c b/src/bin/ephoto_main.c index b59aac0..bd01d91 100644 --- a/src/bin/ephoto_main.c +++ b/src/bin/ephoto_main.c @@ -522,7 +522,6 @@ ephoto_entry_new(Ephoto *ephoto, const char *path, const char *label) void ephoto_entry_free(Ephoto_Entry *entry) { - const char *s; Ephoto_Entry_Free_Listener *fl; EINA_LIST_FREE(entry->free_listeners, fl) @@ -533,7 +532,6 @@ ephoto_entry_free(Ephoto_Entry *entry) EINA_SAFETY_ON_NULL_RETURN(entry); eina_stringshare_del(entry->path); eina_stringshare_del(entry->label); - EINA_LIST_FREE(entry->dir_files, s) eina_stringshare_del(s); free(entry); } diff --git a/src/bin/ephoto_single_browser.c b/src/bin/ephoto_single_browser.c index 9ecca9c..a48d23e 100644 --- a/src/bin/ephoto_single_browser.c +++ b/src/bin/ephoto_single_browser.c @@ -812,7 +812,7 @@ _button_add(Evas_Object *box, const char *image) but = elm_button_add(box); ic = elm_icon_add(but); - elm_image_file_set(ic, image, NULL); + elm_icon_standard_set(ic, image); evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_BOTH, 1, 1); elm_object_content_set(but, ic); @@ -851,23 +851,23 @@ ephoto_single_browser_add(Ephoto *ephoto, Evas_Object *parent) evas_object_show(sb->bar); elm_box_pack_end(sb->main, sb->bar); - but = _button_add(sb->bar, PACKAGE_DATA_DIR "/images/back_grid.png"); + but = _button_add(sb->bar, "go-home"); evas_object_smart_callback_add(but, "clicked", _back, sb); sep = elm_separator_add(sb->bar); elm_box_pack_end(sb->bar, sep); evas_object_show(sep); - but = _button_add(sb->bar, PACKAGE_DATA_DIR "/images/zoom-in.png"); + but = _button_add(sb->bar, "zoom-in"); evas_object_smart_callback_add(but, "clicked", _zoom_in_cb, sb); - but = _button_add(sb->bar, PACKAGE_DATA_DIR "/images/zoom-out.png"); + but = _button_add(sb->bar, "zoom-out"); evas_object_smart_callback_add(but, "clicked", _zoom_out_cb, sb); - but = _button_add(sb->bar, PACKAGE_DATA_DIR "/images/zoom-fit.png"); + but = _button_add(sb->bar, "zoom-fit"); evas_object_smart_callback_add(but, "clicked", _zoom_fit_cb, sb); - but = _button_add(sb->bar, PACKAGE_DATA_DIR "/images/zoom-original.png"); + but = _button_add(sb->bar, "zoom-original"); evas_object_smart_callback_add(but, "clicked", _zoom_1_cb, sb); sep = elm_separator_add(sb->bar); @@ -891,23 +891,23 @@ ephoto_single_browser_add(Ephoto *ephoto, Evas_Object *parent) elm_box_pack_end(sb->bar, sep); evas_object_show(sep); - but = _button_add(sb->bar, PACKAGE_DATA_DIR "/images/first.png"); + but = _button_add(sb->bar, "go-first"); evas_object_smart_callback_add(but, "clicked", _go_first, sb); - but = _button_add(sb->bar, PACKAGE_DATA_DIR "/images/back.png"); + but = _button_add(sb->bar, "go-previous"); evas_object_smart_callback_add(but, "clicked", _go_prev, sb); - but = _button_add(sb->bar, PACKAGE_DATA_DIR "/images/forward.png"); + but = _button_add(sb->bar, "go-next"); evas_object_smart_callback_add(but, "clicked", _go_next, sb); - but = _button_add(sb->bar, PACKAGE_DATA_DIR "/images/last.png"); + but = _button_add(sb->bar, "go-last"); evas_object_smart_callback_add(but, "clicked", _go_last, sb); sep = elm_separator_add(sb->bar); elm_box_pack_end(sb->bar, sep); evas_object_show(sep); - but = _button_add(sb->bar, PACKAGE_DATA_DIR "/images/slideshow.png"); + but = _button_add(sb->bar, "media-playback-start"); evas_object_smart_callback_add(but, "clicked", _slideshow, sb); sb->handlers = eina_list_append diff --git a/src/bin/ephoto_thumb_browser.c b/src/bin/ephoto_thumb_browser.c index 695d611..cce90b2 100644 --- a/src/bin/ephoto_thumb_browser.c +++ b/src/bin/ephoto_thumb_browser.c @@ -65,51 +65,27 @@ _ephoto_thumb_item_text_get(void *data, Evas_Object *obj __UNUSED__, const char } static Evas_Object * -_ephoto_thumb_dir_icon_get(void *data, Evas_Object *obj, const char *part) +_ephoto_thumb_up_icon_get(void *data __UNUSED__, Evas_Object *obj, const char *part __UNUSED__) { - Ephoto_Entry *e = data; - const char *f; - int n; + Evas_Object *ic; - if (strncmp(part, "elm.swallow.icon.", sizeof("elm.swallow.icon.") - 1) != 0) - return NULL; + ic = elm_icon_add(obj); + evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); + elm_icon_standard_set(ic, "go-up"); - n = atoi(part + sizeof("elm.swallow.icon.") - 1); - if (n < 1) - return NULL; - n--; + return ic; +} - f = eina_list_nth(e->dir_files, n); - if (f) - { - Evas_Object *o; - o = ephoto_thumb_add(e->ephoto, obj, f); - //elm_object_style_set(o, "default"); - return o; - } - - if (e->dir_files_checked) - return NULL; - - return ephoto_directory_thumb_add(obj, e); -} - -static Eina_Bool -_ephoto_thumb_dir_state_get(void *data, Evas_Object *obj __UNUSED__, const char *part) +static Evas_Object * +_ephoto_thumb_dir_icon_get(void *data __UNUSED__, Evas_Object *obj, const char *part __UNUSED__) { - Ephoto_Entry *e = data; - int n; - - if (strcmp(part, "have_files") == 0) - return !!e->dir_files; - - if (strncmp(part, "have_file.", sizeof("have_file.") - 1) != 0) - return EINA_FALSE; - - n = atoi(part + sizeof("have_file.") - 1); - if (n < 1) - return EINA_FALSE; - return n <= (int)eina_list_count(e->dir_files); + Evas_Object *ic; + + ic = elm_icon_add(obj); + evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); + elm_icon_standard_set(ic, "folder"); + + return ic; } static Evas_Object * @@ -449,7 +425,7 @@ _button_add(Evas_Object *box, const char *image) but = elm_button_add(box); ic = elm_icon_add(but); - elm_image_file_set(ic, image, NULL); + elm_icon_standard_set(ic, image); evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_BOTH, 1, 1); elm_object_content_set(but, ic); @@ -472,16 +448,16 @@ ephoto_thumb_browser_add(Ephoto *ephoto, Evas_Object *parent) tb = calloc(1, sizeof(Ephoto_Thumb_Browser)); EINA_SAFETY_ON_NULL_GOTO(tb, error); - _ephoto_thumb_up_class.item_style = "ephoto-up"; + _ephoto_thumb_up_class.item_style = "default"; _ephoto_thumb_up_class.func.text_get = _ephoto_thumb_item_text_get; - _ephoto_thumb_up_class.func.content_get = NULL; + _ephoto_thumb_up_class.func.content_get = _ephoto_thumb_up_icon_get; _ephoto_thumb_up_class.func.state_get = NULL; _ephoto_thumb_up_class.func.del = _ephoto_thumb_item_del; - _ephoto_thumb_dir_class.item_style = "ephoto-album-preview"; + _ephoto_thumb_dir_class.item_style = "default"; _ephoto_thumb_dir_class.func.text_get = _ephoto_thumb_item_text_get; _ephoto_thumb_dir_class.func.content_get = _ephoto_thumb_dir_icon_get; - _ephoto_thumb_dir_class.func.state_get = _ephoto_thumb_dir_state_get; + _ephoto_thumb_dir_class.func.state_get = NULL; _ephoto_thumb_dir_class.func.del = _ephoto_thumb_item_del; _ephoto_thumb_file_class.item_style = "thumb"; @@ -509,10 +485,10 @@ ephoto_thumb_browser_add(Ephoto *ephoto, Evas_Object *parent) evas_object_show(tb->bar); elm_box_pack_end(tb->main, tb->bar); - but = _button_add(tb->bar, PACKAGE_DATA_DIR "/images/single.png"); + but = _button_add(tb->bar, "image-x-generic"); evas_object_smart_callback_add(but, "clicked", _view_single, tb); - but = _button_add(tb->bar, PACKAGE_DATA_DIR "/images/slideshow.png"); + but = _button_add(tb->bar, "media-playback-start"); evas_object_smart_callback_add(but, "clicked", _slideshow, tb); tb->entry = elm_entry_add(tb->bar); @@ -529,11 +505,11 @@ ephoto_thumb_browser_add(Ephoto *ephoto, Evas_Object *parent) evas_object_show(tb->entry); elm_box_pack_end(tb->bar, tb->entry); - but = _button_add(tb->bar, PACKAGE_DATA_DIR "/images/zoom-in.png"); + but = _button_add(tb->bar, "zoom-in.png"); evas_object_smart_callback_add(but, "clicked", _zoom_in, tb); max = but; - but = _button_add(tb->bar, PACKAGE_DATA_DIR "/images/zoom-out.png"); + but = _button_add(tb->bar, "zoom-out.png"); evas_object_smart_callback_add(but, "clicked", _zoom_out, tb); min = but;