okra pushed a commit to branch master.
http://git.enlightenment.org/apps/ephoto.git/commit/?id=0f13ed93beba326cd24d76725a1d8382817dd570
commit 0f13ed93beba326cd24d76725a1d8382817dd570
Author: Stephen okra Houston <smhousto...@gmail.com>
Date: Fri Jul 22 17:17:23 2016 -0500
Ephoto: Add more moving effects -- There are now a total of 24 ways an
image can move in the slideshow.
---
data/themes/ephoto.edc | 623 +++++++++++++++++++++++++++++++++++++++++++++
src/bin/ephoto_slideshow.c | 168 +++++++++++-
2 files changed, 789 insertions(+), 2 deletions(-)
diff --git a/data/themes/ephoto.edc b/data/themes/ephoto.edc
index 506c1be..d1f8edb 100644
--- a/data/themes/ephoto.edc
+++ b/data/themes/ephoto.edc
@@ -612,6 +612,106 @@ collections {
"end_bottom_to_top", 0.0,
SINUSOIDAL, pos);
}
+ public left_in(val, Float:pos) {
+ set_state_anim(PART:"ephoto.swallow.slideshow.item",
+ "end_left_in", 0.0,
+ SINUSOIDAL, pos);
+ }
+ public right_in(val, Float:pos) {
+ set_state_anim(PART:"ephoto.swallow.slideshow.item",
+ "end_right_in", 0.0,
+ SINUSOIDAL, pos);
+ }
+ public top_in(val, Float:pos) {
+ set_state_anim(PART:"ephoto.swallow.slideshow.item",
+ "end_top_in", 0.0,
+ SINUSOIDAL, pos);
+ }
+ public bottom_in(val, Float:pos) {
+ set_state_anim(PART:"ephoto.swallow.slideshow.item",
+ "end_bottom_in", 0.0,
+ SINUSOIDAL, pos);
+ }
+ public left_out(val, Float:pos) {
+ set_state_anim(PART:"ephoto.swallow.slideshow.item",
+ "end_left_out", 0.0,
+ SINUSOIDAL, pos);
+ }
+ public right_out(val, Float:pos) {
+ set_state_anim(PART:"ephoto.swallow.slideshow.item",
+ "end_right_out", 0.0,
+ SINUSOIDAL, pos);
+ }
+ public top_out(val, Float:pos) {
+ set_state_anim(PART:"ephoto.swallow.slideshow.item",
+ "end_top_out", 0.0,
+ SINUSOIDAL, pos);
+ }
+ public bottom_out(val, Float:pos) {
+ set_state_anim(PART:"ephoto.swallow.slideshow.item",
+ "end_bottom_out", 0.0,
+ SINUSOIDAL, pos);
+ }
+ public left_top_corner(val, Float:pos) {
+ set_state_anim(PART:"ephoto.swallow.slideshow.item",
+ "end_left_top_corner", 0.0,
+ SINUSOIDAL, pos);
+ }
+ public right_top_corner(val, Float:pos) {
+ set_state_anim(PART:"ephoto.swallow.slideshow.item",
+ "end_right_top_corner", 0.0,
+ SINUSOIDAL, pos);
+ }
+ public right_bottom_corner(val, Float:pos) {
+ set_state_anim(PART:"ephoto.swallow.slideshow.item",
+ "end_right_bottom_corner", 0.0,
+ SINUSOIDAL, pos);
+ }
+ public left_bottom_corner(val, Float:pos) {
+ set_state_anim(PART:"ephoto.swallow.slideshow.item",
+ "end_left_bottom_corner", 0.0,
+ SINUSOIDAL, pos);
+ }
+ public left_top_corner_in(val, Float:pos) {
+ set_state_anim(PART:"ephoto.swallow.slideshow.item",
+ "end_left_top_corner_in", 0.0,
+ SINUSOIDAL, pos);
+ }
+ public right_top_corner_in(val, Float:pos) {
+ set_state_anim(PART:"ephoto.swallow.slideshow.item",
+ "end_right_top_corner_in", 0.0,
+ SINUSOIDAL, pos);
+ }
+ public right_bottom_corner_in(val, Float:pos) {
+ set_state_anim(PART:"ephoto.swallow.slideshow.item",
+ "end_right_bottom_corner_in", 0.0,
+ SINUSOIDAL, pos);
+ }
+ public left_bottom_corner_in(val, Float:pos) {
+ set_state_anim(PART:"ephoto.swallow.slideshow.item",
+ "end_left_bottom_corner_in", 0.0,
+ SINUSOIDAL, pos);
+ }
+ public left_top_corner_out(val, Float:pos) {
+ set_state_anim(PART:"ephoto.swallow.slideshow.item",
+ "end_left_top_corner_out", 0.0,
+ SINUSOIDAL, pos);
+ }
+ public right_top_corner_out(val, Float:pos) {
+ set_state_anim(PART:"ephoto.swallow.slideshow.item",
+ "end_right_top_corner_out", 0.0,
+ SINUSOIDAL, pos);
+ }
+ public right_bottom_corner_out(val, Float:pos) {
+ set_state_anim(PART:"ephoto.swallow.slideshow.item",
+ "end_right_bottom_corner_out", 0.0,
+ SINUSOIDAL, pos);
+ }
+ public left_bottom_corner_out(val, Float:pos) {
+ set_state_anim(PART:"ephoto.swallow.slideshow.item",
+ "end_left_bottom_corner_out", 0.0,
+ SINUSOIDAL, pos);
+ }
}
parts {
rect { "background";
@@ -692,6 +792,269 @@ collections {
rel1.relative: 0.0 -0.2;
rel2.relative: 1.0 1.0;
}
+ description {
+ state: "default_left_in" 0.0;
+ rel1.to: "background";
+ rel1.relative: -0.5 0.0;
+ rel2.to: "background";
+ rel2.relative: 1.0 1.0;
+ }
+ description {
+ state: "end_left_in" 0.0;
+ rel1.to: "background";
+ rel1.relative: -0.1 0.0;
+ rel2.to: "background";
+ rel2.relative: 1.0 1.0;
+ }
+ description {
+ state: "default_right_in" 0.0;
+ rel1.to: "background";
+ rel1.relative: 0.0 0.0;
+ rel2.to: "background";
+ rel2.relative: 1.5 1.0;
+ }
+ description {
+ state: "end_right_in" 0.0;
+ rel1.to: "background";
+ rel1.relative: 0.0 0.0;
+ rel2.to: "background";
+ rel2.relative: 1.1 1.0;
+ }
+ description {
+ state: "default_top_in" 0.0;
+ rel1.to: "background";
+ rel1.relative: 0.0 -0.5;
+ rel2.to: "background";
+ rel2.relative: 1.0 1.0;
+ }
+ description {
+ state: "end_top_in" 0.0;
+ rel1.to: "background";
+ rel1.relative: 0.0 -0.1;
+ rel2.to: "background";
+ rel2.relative: 1.0 1.0;
+ }
+ description {
+ state: "default_bottom_in" 0.0;
+ rel1.to: "background";
+ rel1.relative: 0.0 0.0;
+ rel2.to: "background";
+ rel2.relative: 1.0 1.5;
+ }
+ description {
+ state: "end_bottom_in" 0.0;
+ inherit: "default" 0.0;
+ rel1.relative: 0.0 0.0;
+ rel2.relative: 1.0 1.1;
+ }
+ description {
+ state: "default_left_out" 0.0;
+ rel1.to: "background";
+ rel1.relative: -0.1 0.0;
+ rel2.to: "background";
+ rel2.relative: 1.0 1.0;
+ }
+ description {
+ state: "end_left_out" 0.0;
+ inherit: "default" 0.0;
+ rel1.relative: -0.5 0.0;
+ rel2.relative: 1.0 1.0;
+ }
+ description {
+ state: "default_right_out" 0.0;
+ rel1.to: "background";
+ rel1.relative: 0.0 0.0;
+ rel2.to: "background";
+ rel2.relative: 1.1 1.0;
+ }
+ description {
+ state: "end_right_out" 0.0;
+ inherit: "default" 0.0;
+ rel1.relative: 0.0 0.0;
+ rel2.relative: 1.5 1.0;
+ }
+ description {
+ state: "default_top_out" 0.0;
+ rel1.to: "background";
+ rel1.relative: 0.0 -0.1;
+ rel2.to: "background";
+ rel2.relative: 1.0 1.0;
+ }
+ description {
+ state: "end_top_out" 0.0;
+ inherit: "default" 0.0;
+ rel1.relative: 0.0 -0.5;
+ rel2.relative: 1.0 1.0;
+ }
+ description {
+ state: "default_bottom_out" 0.0;
+ rel1.to: "background";
+ rel1.relative: 0.0 0.0;
+ rel2.to: "background";
+ rel2.relative: 1.0 1.0;
+ }
+ description {
+ state: "end_bottom_out" 0.0;
+ inherit: "default" 0.0;
+ rel1.relative: 0.0 0.0;
+ rel2.relative: 1.0 1.4;
+ }
+ description {
+ state: "default_left_top_corner" 0.0;
+ rel1.to: "background";
+ rel1.relative: -0.2 -0.2;
+ rel2.to: "background";
+ rel2.relative: 1.0 1.0;
+ }
+ description {
+ state: "end_left_top_corner" 0.0;
+ inherit: "default" 0.0;
+ rel1.relative: 0.0 0.0;
+ rel2.relative: 1.2 1.2;
+ }
+ description {
+ state: "default_right_top_corner" 0.0;
+ rel1.to: "background";
+ rel1.relative: 0.0 -0.2;
+ rel2.to: "background";
+ rel2.relative: 1.2 1.0;
+ }
+ description {
+ state: "end_right_top_corner" 0.0;
+ inherit: "default" 0.0;
+ rel1.relative: -0.2 0.0;
+ rel2.relative: 1.0 1.2;
+ }
+ description {
+ state: "default_right_bottom_corner" 0.0;
+ rel1.to: "background";
+ rel1.relative: 0.0 0.0;
+ rel2.to: "background";
+ rel2.relative: 1.2 1.2;
+ }
+ description {
+ state: "end_right_bottom_corner" 0.0;
+ inherit: "default" 0.0;
+ rel1.relative: -0.2 -0.2;
+ rel2.relative: 1.0 1.0;
+ }
+ description {
+ state: "default_left_bottom_corner" 0.0;
+ rel1.to: "background";
+ rel1.relative: -0.2 0.0;
+ rel2.to: "background";
+ rel2.relative: 1.0 1.2;
+ }
+ description {
+ state: "end_left_bottom_corner" 0.0;
+ inherit: "default" 0.0;
+ rel1.relative: 0.0 -0.2;
+ rel2.relative: 1.2 1.0;
+ }
+ description {
+ state: "default_left_top_corner_in" 0.0;
+ rel1.to: "background";
+ rel1.relative: -0.5 -0.5;
+ rel2.to: "background";
+ rel2.relative: 1.0 1.0;
+ }
+ description {
+ state: "end_left_top_corner_in" 0.0;
+ inherit: "default" 0.0;
+ rel1.relative: -0.1 -0.1;
+ rel2.relative: 1.0 1.0;
+ }
+ description {
+ state: "default_right_top_corner_in" 0.0;
+ rel1.to: "background";
+ rel1.relative: 0.0 -0.5;
+ rel2.to: "background";
+ rel2.relative: 1.5 1.0;
+ }
+ description {
+ state: "end_right_top_corner_in" 0.0;
+ inherit: "default" 0.0;
+ rel1.relative: 0.0 -0.1;
+ rel2.relative: 1.1 1.0;
+ }
+ description {
+ state: "default_right_bottom_corner_in" 0.0;
+ rel1.to: "background";
+ rel1.relative: 0.0 0.0;
+ rel2.to: "background";
+ rel2.relative: 1.5 1.5;
+ }
+ description {
+ state: "end_right_bottom_corner_in" 0.0;
+ inherit: "default" 0.0;
+ rel1.relative: 0.0 0.0;
+ rel2.relative: 1.1 1.1;
+ }
+ description {
+ state: "default_left_bottom_corner_in" 0.0;
+ rel1.to: "background";
+ rel1.relative: -0.5 0.0;
+ rel2.to: "background";
+ rel2.relative: 1.0 1.5;
+ }
+ description {
+ state: "end_left_bottom_corner_in" 0.0;
+ inherit: "default" 0.0;
+ rel1.relative: -0.1 0.0;
+ rel2.relative: 1.0 1.1;
+ }
+ description {
+ state: "default_left_top_corner_out" 0.0;
+ rel1.to: "background";
+ rel1.relative: -0.1 -0.1;
+ rel2.to: "background";
+ rel2.relative: 1.0 1.0;
+ }
+ description {
+ state: "end_left_top_corner_out" 0.0;
+ inherit: "default" 0.0;
+ rel1.relative: -0.5 -0.5;
+ rel2.relative: 1.0 1.0;
+ }
+ description {
+ state: "default_right_top_corner_out" 0.0;
+ rel1.to: "background";
+ rel1.relative: 0.0 -0.1;
+ rel2.to: "background";
+ rel2.relative: 1.1 1.0;
+ }
+ description {
+ state: "end_right_top_corner_out" 0.0;
+ inherit: "default" 0.0;
+ rel1.relative: 0.0 -0.5;
+ rel2.relative: 1.5 1.0;
+ }
+ description {
+ state: "default_right_bottom_corner_out" 0.0;
+ rel1.to: "background";
+ rel1.relative: 0.0 0.0;
+ rel2.to: "background";
+ rel2.relative: 1.1 1.1;
+ }
+ description {
+ state: "end_right_bottom_corner_out" 0.0;
+ inherit: "default" 0.0;
+ rel1.relative: 0.0 0.0;
+ rel2.relative: 1.5 1.5;
+ }
+ description {
+ state: "default_left_bottom_corner_out" 0.0;
+ rel1.to: "background";
+ rel1.relative: -0.1 0.0;
+ rel2.to: "background";
+ rel2.relative: 1.0 1.1;
+ }
+ description {
+ state: "end_left_bottom_corner_out" 0.0;
+ inherit: "default" 0.0;
+ rel1.relative: -0.5 0.0;
+ rel2.relative: 1.0 1.5;
+ }
}
}
programs {
@@ -724,6 +1087,146 @@ collections {
}
}
program {
+ signal: "ephoto,slideshow,move,left,in";
+ source: "ephoto";
+ script {
+ anim(get_float(timeout), "left_in", 1);
+ }
+ }
+ program {
+ signal: "ephoto,slideshow,move,right,in";
+ source: "ephoto";
+ script {
+ anim(get_float(timeout), "right_in", 1);
+ }
+ }
+ program {
+ signal: "ephoto,slideshow,move,top,in";
+ source: "ephoto";
+ script {
+ anim(get_float(timeout), "top_in", 1);
+ }
+ }
+ program {
+ signal: "ephoto,slideshow,move,bottom,in";
+ source: "ephoto";
+ script {
+ anim(get_float(timeout), "bottom_in", 1);
+ }
+ }
+ program {
+ signal: "ephoto,slideshow,move,left,out";
+ source: "ephoto";
+ script {
+ anim(get_float(timeout), "left_out", 1);
+ }
+ }
+ program {
+ signal: "ephoto,slideshow,move,right,out";
+ source: "ephoto";
+ script {
+ anim(get_float(timeout), "right_out", 1);
+ }
+ }
+ program {
+ signal: "ephoto,slideshow,move,top,out";
+ source: "ephoto";
+ script {
+ anim(get_float(timeout), "top_out", 1);
+ }
+ }
+ program {
+ signal: "ephoto,slideshow,move,bottom,out";
+ source: "ephoto";
+ script {
+ anim(get_float(timeout), "bottom_out", 1);
+ }
+ }
+ program {
+ signal: "ephoto,slideshow,move,left,top,corner";
+ source: "ephoto";
+ script {
+ anim(get_float(timeout), "left_top_corner", 1);
+ }
+ }
+ program {
+ signal: "ephoto,slideshow,move,right,top,corner";
+ source: "ephoto";
+ script {
+ anim(get_float(timeout), "right_top_corner", 1);
+ }
+ }
+ program {
+ signal: "ephoto,slideshow,move,right,bottom,corner";
+ source: "ephoto";
+ script {
+ anim(get_float(timeout), "right_bottom_corner", 1);
+ }
+ }
+ program {
+ signal: "ephoto,slideshow,move,left,bottom,corner";
+ source: "ephoto";
+ script {
+ anim(get_float(timeout), "left_bottom_corner", 1);
+ }
+ }
+ program {
+ signal: "ephoto,slideshow,move,left,top,corner,in";
+ source: "ephoto";
+ script {
+ anim(get_float(timeout), "left_top_corner_in", 1);
+ }
+ }
+ program {
+ signal: "ephoto,slideshow,move,right,top,corner,in";
+ source: "ephoto";
+ script {
+ anim(get_float(timeout), "right_top_corner_in", 1);
+ }
+ }
+ program {
+ signal: "ephoto,slideshow,move,right,bottom,corner,in";
+ source: "ephoto";
+ script {
+ anim(get_float(timeout), "right_bottom_corner_in", 1);
+ }
+ }
+ program {
+ signal: "ephoto,slideshow,move,left,bottom,corner,in";
+ source: "ephoto";
+ script {
+ anim(get_float(timeout), "left_bottom_corner_in", 1);
+ }
+ }
+ program {
+ signal: "ephoto,slideshow,move,left,top,corner,out";
+ source: "ephoto";
+ script {
+ anim(get_float(timeout), "left_top_corner_out", 1);
+ }
+ }
+ program {
+ signal: "ephoto,slideshow,move,right,top,corner,out";
+ source: "ephoto";
+ script {
+ anim(get_float(timeout), "right_top_corner_out", 1);
+ }
+ }
+ program {
+ signal: "ephoto,slideshow,move,right,bottom,corner,out";
+ source: "ephoto";
+ script {
+ anim(get_float(timeout), "right_bottom_corner_out", 1);
+ }
+ }
+ program {
+ signal: "ephoto,slideshow,move,left,bottom,corner,out";
+ source: "ephoto";
+ script {
+ anim(get_float(timeout), "left_bottom_corner_out", 1);
+ }
+ }
+ program {
signal: "ephoto,slideshow,default,left,to,right";
source: "ephoto";
action: STATE_SET "default_left_to_right" 0.0;
@@ -747,6 +1250,126 @@ collections {
action: STATE_SET "default_bottom_to_top" 0.0;
target: "ephoto.swallow.slideshow.item";
}
+ program {
+ signal: "ephoto,slideshow,default,left,in";
+ source: "ephoto";
+ action: STATE_SET "default_left_in" 0.0;
+ target: "ephoto.swallow.slideshow.item";
+ }
+ program {
+ signal: "ephoto,slideshow,default,right,in";
+ source: "ephoto";
+ action: STATE_SET "default_right_in" 0.0;
+ target: "ephoto.swallow.slideshow.item";
+ }
+ program {
+ signal: "ephoto,slideshow,default,top,in";
+ source: "ephoto";
+ action: STATE_SET "default_top_in" 0.0;
+ target: "ephoto.swallow.slideshow.item";
+ }
+ program {
+ signal: "ephoto,slideshow,default,bottom,in";
+ source: "ephoto";
+ action: STATE_SET "default_bottom_in" 0.0;
+ target: "ephoto.swallow.slideshow.item";
+ }
+ program {
+ signal: "ephoto,slideshow,default,left,out";
+ source: "ephoto";
+ action: STATE_SET "default_left_out" 0.0;
+ target: "ephoto.swallow.slideshow.item";
+ }
+ program {
+ signal: "ephoto,slideshow,default,right,out";
+ source: "ephoto";
+ action: STATE_SET "default_right_out" 0.0;
+ target: "ephoto.swallow.slideshow.item";
+ }
+ program {
+ signal: "ephoto,slideshow,default,top,out";
+ source: "ephoto";
+ action: STATE_SET "default_top_out" 0.0;
+ target: "ephoto.swallow.slideshow.item";
+ }
+ program {
+ signal: "ephoto,slideshow,default,bottom,out";
+ source: "ephoto";
+ action: STATE_SET "default_bottom_out" 0.0;
+ target: "ephoto.swallow.slideshow.item";
+ }
+ program {
+ signal: "ephoto,slideshow,default,left,top,corner";
+ source: "ephoto";
+ action: STATE_SET "default_left_top_corner" 0.0;
+ target: "ephoto.swallow.slideshow.item";
+ }
+ program {
+ signal: "ephoto,slideshow,default,right,top,corner";
+ source: "ephoto";
+ action: STATE_SET "default_right_top_corner" 0.0;
+ target: "ephoto.swallow.slideshow.item";
+ }
+ program {
+ signal: "ephoto,slideshow,default,right,bottom,corner";
+ source: "ephoto";
+ action: STATE_SET "default_right_bottom_corner" 0.0;
+ target: "ephoto.swallow.slideshow.item";
+ }
+ program {
+ signal: "ephoto,slideshow,default,left,bottom,corner";
+ source: "ephoto";
+ action: STATE_SET "default_left_bottom_corner" 0.0;
+ target: "ephoto.swallow.slideshow.item";
+ }
+ program {
+ signal: "ephoto,slideshow,default,left,top,corner,in";
+ source: "ephoto";
+ action: STATE_SET "default_left_top_corner_in" 0.0;
+ target: "ephoto.swallow.slideshow.item";
+ }
+ program {
+ signal: "ephoto,slideshow,default,right,top,corner,in";
+ source: "ephoto";
+ action: STATE_SET "default_right_top_corner_in" 0.0;
+ target: "ephoto.swallow.slideshow.item";
+ }
+ program {
+ signal: "ephoto,slideshow,default,right,bottom,corner,in";
+ source: "ephoto";
+ action: STATE_SET "default_right_bottom_corner_in" 0.0;
+ target: "ephoto.swallow.slideshow.item";
+ }
+ program {
+ signal: "ephoto,slideshow,default,left,bottom,corner,in";
+ source: "ephoto";
+ action: STATE_SET "default_left_bottom_corner_in" 0.0;
+ target: "ephoto.swallow.slideshow.item";
+ }
+ program {
+ signal: "ephoto,slideshow,default,left,top,corner,out";
+ source: "ephoto";
+ action: STATE_SET "default_left_top_corner_out" 0.0;
+ target: "ephoto.swallow.slideshow.item";
+ }
+ program {
+ signal: "ephoto,slideshow,default,right,top,corner,out";
+ source: "ephoto";
+ action: STATE_SET "default_right_top_corner_out" 0.0;
+ target: "ephoto.swallow.slideshow.item";
+ }
+ program {
+ signal: "ephoto,slideshow,default,right,bottom,corner,out";
+ source: "ephoto";
+ action: STATE_SET "default_right_bottom_corner_out" 0.0;
+ target: "ephoto.swallow.slideshow.item";
+ }
+ program {
+ signal: "ephoto,slideshow,default,left,bottom,corner,out";
+ source: "ephoto";
+ action: STATE_SET "default_left_bottom_corner_out" 0.0;
+ target: "ephoto.swallow.slideshow.item";
+ }
}
}
group { name: "ephoto,image,cropper,base";
diff --git a/src/bin/ephoto_slideshow.c b/src/bin/ephoto_slideshow.c
index 6c08149..3b7626d 100644
--- a/src/bin/ephoto_slideshow.c
+++ b/src/bin/ephoto_slideshow.c
@@ -8,7 +8,27 @@ enum _Ephoto_Slideshow_Move
EPHOTO_SLIDESHOW_MOVE_LEFT_TO_RIGHT,
EPHOTO_SLIDESHOW_MOVE_RIGHT_TO_LEFT,
EPHOTO_SLIDESHOW_MOVE_TOP_TO_BOTTOM,
- EPHOTO_SLIDESHOW_MOVE_BOTTOM_TO_TOP
+ EPHOTO_SLIDESHOW_MOVE_BOTTOM_TO_TOP,
+ EPHOTO_SLIDESHOW_MOVE_LEFT_IN,
+ EPHOTO_SLIDESHOW_MOVE_RIGHT_IN,
+ EPHOTO_SLIDESHOW_MOVE_TOP_IN,
+ EPHOTO_SLIDESHOW_MOVE_BOTTOM_IN,
+ EPHOTO_SLIDESHOW_MOVE_LEFT_OUT,
+ EPHOTO_SLIDESHOW_MOVE_RIGHT_OUT,
+ EPHOTO_SLIDESHOW_MOVE_TOP_OUT,
+ EPHOTO_SLIDESHOW_MOVE_BOTTOM_OUT,
+ EPHOTO_SLIDESHOW_MOVE_LEFT_TOP_CORNER,
+ EPHOTO_SLIDESHOW_MOVE_RIGHT_TOP_CORNER,
+ EPHOTO_SLIDESHOW_MOVE_RIGHT_BOTTOM_CORNER,
+ EPHOTO_SLIDESHOW_MOVE_LEFT_BOTTOM_CORNER,
+ EPHOTO_SLIDESHOW_MOVE_LEFT_TOP_CORNER_IN,
+ EPHOTO_SLIDESHOW_MOVE_RIGHT_TOP_CORNER_IN,
+ EPHOTO_SLIDESHOW_MOVE_RIGHT_BOTTOM_CORNER_IN,
+ EPHOTO_SLIDESHOW_MOVE_LEFT_BOTTOM_CORNER_IN,
+ EPHOTO_SLIDESHOW_MOVE_LEFT_TOP_CORNER_OUT,
+ EPHOTO_SLIDESHOW_MOVE_RIGHT_TOP_CORNER_OUT,
+ EPHOTO_SLIDESHOW_MOVE_RIGHT_BOTTOM_CORNER_OUT,
+ EPHOTO_SLIDESHOW_MOVE_LEFT_BOTTOM_CORNER_OUT
};
struct _Ephoto_Slideshow
@@ -63,6 +83,46 @@ _slideshow_move_end_get(Ephoto_Slideshow *ss)
return "ephoto,slideshow,move,top,to,bottom";
case EPHOTO_SLIDESHOW_MOVE_BOTTOM_TO_TOP:
return "ephoto,slideshow,move,bottom,to,top";
+ case EPHOTO_SLIDESHOW_MOVE_LEFT_IN:
+ return "ephoto,slideshow,move,left,in";
+ case EPHOTO_SLIDESHOW_MOVE_RIGHT_IN:
+ return "ephoto,slideshow,move,right,in";
+ case EPHOTO_SLIDESHOW_MOVE_TOP_IN:
+ return "ephoto,slideshow,move,top,in";
+ case EPHOTO_SLIDESHOW_MOVE_BOTTOM_IN:
+ return "ephoto,slideshow,move,bottom,in";
+ case EPHOTO_SLIDESHOW_MOVE_LEFT_OUT:
+ return "ephoto,slideshow,move,left,out";
+ case EPHOTO_SLIDESHOW_MOVE_RIGHT_OUT:
+ return "ephoto,slideshow,move,right,out";
+ case EPHOTO_SLIDESHOW_MOVE_TOP_OUT:
+ return "ephoto,slideshow,move,top,out";
+ case EPHOTO_SLIDESHOW_MOVE_BOTTOM_OUT:
+ return "ephoto,slideshow,move,bottom,out";
+ case EPHOTO_SLIDESHOW_MOVE_LEFT_TOP_CORNER:
+ return "ephoto,slideshow,move,left,top,corner";
+ case EPHOTO_SLIDESHOW_MOVE_RIGHT_TOP_CORNER:
+ return "ephoto,slideshow,move,right,top,corner";
+ case EPHOTO_SLIDESHOW_MOVE_RIGHT_BOTTOM_CORNER:
+ return "ephoto,slideshow,move,right,bottom,corner";
+ case EPHOTO_SLIDESHOW_MOVE_LEFT_BOTTOM_CORNER:
+ return "ephoto,slideshow,move,left,bottom,corner";
+ case EPHOTO_SLIDESHOW_MOVE_LEFT_TOP_CORNER_IN:
+ return "ephoto,slideshow,move,left,top,corner,in";
+ case EPHOTO_SLIDESHOW_MOVE_RIGHT_TOP_CORNER_IN:
+ return "ephoto,slideshow,move,right,top,corner,in";
+ case EPHOTO_SLIDESHOW_MOVE_RIGHT_BOTTOM_CORNER_IN:
+ return "ephoto,slideshow,move,right,bottom,corner,in";
+ case EPHOTO_SLIDESHOW_MOVE_LEFT_BOTTOM_CORNER_IN:
+ return "ephoto,slideshow,move,left,bottom,corner,in";
+ case EPHOTO_SLIDESHOW_MOVE_LEFT_TOP_CORNER_OUT:
+ return "ephoto,slideshow,move,left,top,corner,out";
+ case EPHOTO_SLIDESHOW_MOVE_RIGHT_TOP_CORNER_OUT:
+ return "ephoto,slideshow,move,right,top,corner,out";
+ case EPHOTO_SLIDESHOW_MOVE_RIGHT_BOTTOM_CORNER_OUT:
+ return "ephoto,slideshow,move,right,bottom,corner,out";
+ case EPHOTO_SLIDESHOW_MOVE_LEFT_BOTTOM_CORNER_OUT:
+ return "ephoto,slideshow,move,left,bottom,corner,out";
default: return "default";
}
}
@@ -80,6 +140,46 @@ _slideshow_move_start_get(Ephoto_Slideshow *ss)
return "ephoto,slideshow,default,top,to,bottom";
case EPHOTO_SLIDESHOW_MOVE_BOTTOM_TO_TOP:
return "ephoto,slideshow,default,bottom,to,top";
+ case EPHOTO_SLIDESHOW_MOVE_LEFT_IN:
+ return "ephoto,slideshow,default,left,in";
+ case EPHOTO_SLIDESHOW_MOVE_RIGHT_IN:
+ return "ephoto,slideshow,default,right,in";
+ case EPHOTO_SLIDESHOW_MOVE_TOP_IN:
+ return "ephoto,slideshow,default,top,in";
+ case EPHOTO_SLIDESHOW_MOVE_BOTTOM_IN:
+ return "ephoto,slideshow,default,bottom,in";
+ case EPHOTO_SLIDESHOW_MOVE_LEFT_OUT:
+ return "ephoto,slideshow,default,left,out";
+ case EPHOTO_SLIDESHOW_MOVE_RIGHT_OUT:
+ return "ephoto,slideshow,default,right,out";
+ case EPHOTO_SLIDESHOW_MOVE_TOP_OUT:
+ return "ephoto,slideshow,default,top,out";
+ case EPHOTO_SLIDESHOW_MOVE_BOTTOM_OUT:
+ return "ephoto,slideshow,default,bottom,out";
+ case EPHOTO_SLIDESHOW_MOVE_LEFT_TOP_CORNER:
+ return "ephoto,slideshow,default,left,top,corner";
+ case EPHOTO_SLIDESHOW_MOVE_RIGHT_TOP_CORNER:
+ return "ephoto,slideshow,default,right,top,corner";
+ case EPHOTO_SLIDESHOW_MOVE_RIGHT_BOTTOM_CORNER:
+ return "ephoto,slideshow,default,right,bottom,corner";
+ case EPHOTO_SLIDESHOW_MOVE_LEFT_BOTTOM_CORNER:
+ return "ephoto,slideshow,default,left,bottom,corner";
+ case EPHOTO_SLIDESHOW_MOVE_LEFT_TOP_CORNER_IN:
+ return "ephoto,slideshow,default,left,top,corner,in";
+ case EPHOTO_SLIDESHOW_MOVE_RIGHT_TOP_CORNER_IN:
+ return "ephoto,slideshow,default,right,top,corner,in";
+ case EPHOTO_SLIDESHOW_MOVE_RIGHT_BOTTOM_CORNER_IN:
+ return "ephoto,slideshow,default,right,bottom,corner,in";
+ case EPHOTO_SLIDESHOW_MOVE_LEFT_BOTTOM_CORNER_IN:
+ return "ephoto,slideshow,default,left,bottom,corner,in";
+ case EPHOTO_SLIDESHOW_MOVE_LEFT_TOP_CORNER_OUT:
+ return "ephoto,slideshow,default,left,top,corner,out";
+ case EPHOTO_SLIDESHOW_MOVE_RIGHT_TOP_CORNER_OUT:
+ return "ephoto,slideshow,default,right,top,corner,out";
+ case EPHOTO_SLIDESHOW_MOVE_RIGHT_BOTTOM_CORNER_OUT:
+ return "ephoto,slideshow,default,right,bottom,corner,out";
+ case EPHOTO_SLIDESHOW_MOVE_LEFT_BOTTOM_CORNER_OUT:
+ return "ephoto,slideshow,default,left,bottom,corner,out";
default: return "default";
}
}
@@ -88,7 +188,7 @@ static void
_slideshow_move_randomize(Ephoto_Slideshow *ss)
{
int i, r = 0;
- int range = 4;
+ int range = 24;
int buckets = RAND_MAX / range;
int limit = buckets * range;
@@ -113,6 +213,66 @@ _slideshow_move_randomize(Ephoto_Slideshow *ss)
case 3:
ss->move = EPHOTO_SLIDESHOW_MOVE_BOTTOM_TO_TOP;
break;
+ case 4:
+ ss->move = EPHOTO_SLIDESHOW_MOVE_LEFT_IN;
+ break;
+ case 5:
+ ss->move = EPHOTO_SLIDESHOW_MOVE_RIGHT_IN;
+ break;
+ case 6:
+ ss->move = EPHOTO_SLIDESHOW_MOVE_TOP_IN;
+ break;
+ case 7:
+ ss->move = EPHOTO_SLIDESHOW_MOVE_BOTTOM_IN;
+ break;
+ case 8:
+ ss->move = EPHOTO_SLIDESHOW_MOVE_LEFT_OUT;
+ break;
+ case 9:
+ ss->move = EPHOTO_SLIDESHOW_MOVE_RIGHT_OUT;
+ break;
+ case 10:
+ ss->move = EPHOTO_SLIDESHOW_MOVE_TOP_OUT;
+ break;
+ case 11:
+ ss->move = EPHOTO_SLIDESHOW_MOVE_BOTTOM_OUT;
+ break;
+ case 12:
+ ss->move = EPHOTO_SLIDESHOW_MOVE_LEFT_TOP_CORNER;
+ break;
+ case 13:
+ ss->move = EPHOTO_SLIDESHOW_MOVE_RIGHT_TOP_CORNER;
+ break;
+ case 14:
+ ss->move = EPHOTO_SLIDESHOW_MOVE_RIGHT_BOTTOM_CORNER;
+ break;
+ case 15:
+ ss->move = EPHOTO_SLIDESHOW_MOVE_LEFT_BOTTOM_CORNER;
+ break;
+ case 16:
+ ss->move = EPHOTO_SLIDESHOW_MOVE_LEFT_TOP_CORNER_IN;
+ break;
+ case 17:
+ ss->move = EPHOTO_SLIDESHOW_MOVE_RIGHT_TOP_CORNER_IN;
+ break;
+ case 18:
+ ss->move = EPHOTO_SLIDESHOW_MOVE_RIGHT_BOTTOM_CORNER_IN;
+ break;
+ case 19:
+ ss->move = EPHOTO_SLIDESHOW_MOVE_LEFT_BOTTOM_CORNER_IN;
+ break;
+ case 20:
+ ss->move = EPHOTO_SLIDESHOW_MOVE_LEFT_TOP_CORNER_OUT;
+ break;
+ case 21:
+ ss->move = EPHOTO_SLIDESHOW_MOVE_RIGHT_TOP_CORNER_OUT;
+ break;
+ case 22:
+ ss->move = EPHOTO_SLIDESHOW_MOVE_RIGHT_BOTTOM_CORNER_OUT;
+ break;
+ case 23:
+ ss->move = EPHOTO_SLIDESHOW_MOVE_LEFT_BOTTOM_CORNER_OUT;
+ break;
default: ss->move = EPHOTO_SLIDESHOW_MOVE_LEFT_TO_RIGHT;
}
}
@@ -240,6 +400,8 @@ _slideshow_transition(void *data)
elm_layout_signal_emit(ss->slideshow, buf, "ephoto");
if (ss->ephoto->config->movess)
{
+ printf("%s\n", _slideshow_move_start_get(ss));
+ printf("%s\n", _slideshow_move_end_get(ss));
elm_layout_signal_emit(ss->current_item,
_slideshow_move_start_get(ss), "ephoto");
elm_layout_signal_emit(ss->current_item, _slideshow_move_end_get(ss),
"ephoto");
_slideshow_move_randomize(ss);
@@ -277,6 +439,8 @@ _slideshow_play(Ephoto_Slideshow *ss)
if (ss->ephoto->config->movess)
{
+ printf("%s\n", _slideshow_move_start_get(ss));
+ printf("%s\n", _slideshow_move_end_get(ss));
elm_layout_signal_emit(ss->current_item,
_slideshow_move_start_get(ss), "ephoto");
elm_layout_signal_emit(ss->current_item, _slideshow_move_end_get(ss),
"ephoto");
_slideshow_move_randomize(ss);
--
